diff --git a/Templates/Templates SNMP/SNMP Traps Basic.xml b/Templates/Templates SNMP/SNMP Traps Basic.xml
new file mode 100644
index 0000000..33b0cf8
--- /dev/null
+++ b/Templates/Templates SNMP/SNMP Traps Basic.xml
@@ -0,0 +1,236 @@
+
+
+ 3.0
+ 2018-12-13T09:09:34Z
+
+
+ Templates SNMP
+
+
+
+
+ SNMP Traps Basic
+ SNMP Traps Basic
+
+
+
+ Templates SNMP
+
+
+
+
+ -
+ snmptrap
+ 17
+
+ 0
+
+ snmptrap
+ 0
+ 7
+ 0
+ 0
+ 2
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 0
+
+
+ hh:mm:ss yyyy/MM/dd
+
+ -
+ SNMP trap fallback
+ 17
+
+ 0
+
+ snmptrap.fallback
+ 0
+ 7
+ 0
+ 0
+ 2
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 0
+
+
+ hh:mm:ss yyyy/MM/dd
+
+ -
+ snmptrap["Configuration Event"]
+ 17
+
+ 0
+
+ snmptrap[".1.3.6.1.4.1.9.9.43.2.0.1"]
+ 0
+ 7
+ 0
+ 0
+ 2
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 0
+
+
+ hh:mm:ss yyyy/MM/dd
+
+ -
+ snmptrap["DISMAN-EVENT-MIB::sysUpTimeInstance"]
+ 17
+
+ 0
+
+ snmptrap["DISMAN-EVENT-MIB::sysUpTimeInstance"]
+ 0
+ 7
+ 0
+ 0
+ 2
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 0
+
+
+ hh:mm:ss yyyy/MM/dd
+
+ -
+ snmptrap["General"]
+ 17
+
+ 0
+
+ snmptrap["General"]
+ 0
+ 7
+ 0
+ 0
+ 2
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 0
+
+
+ hh:mm:ss yyyy/MM/dd
+
+
+
+
+
+
+
+
+
+
+ {SNMP Traps Basic:snmptrap.fallback.nodata(300)}=0
+ Unmatched SNMP Trap received from {HOST.NAME}
+
+ 0
+ 1
+
+ 0
+
+
+
+
diff --git a/Templates/Templates SNMP/SNMPv2 NetworkInterfaces.xml b/Templates/Templates SNMP/SNMPv2 NetworkInterfaces.xml
new file mode 100644
index 0000000..220d25c
--- /dev/null
+++ b/Templates/Templates SNMP/SNMPv2 NetworkInterfaces.xml
@@ -0,0 +1,396 @@
+
+
+ 3.0
+ 2018-12-13T09:10:19Z
+
+
+ Templates SNMP
+
+
+
+
+ SNMPv2 NetworkInterfaces
+ SNMPv2 NetworkInterfaces
+
+
+
+ Templates SNMP
+
+
+
+
+ Interfaces
+
+
+
+ -
+ Number of network interfaces
+ 4
+ {$SNMP_COMMUNITY}
+ 0
+ IF-MIB::ifNumber.0
+ ifNumber
+ 3600
+ 7
+ 365
+ 0
+ 3
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+ The number of network interfaces (regardless of their current state) present on this system.
+ 0
+
+
+ Interfaces
+
+
+
+
+
+
+
+
+ Network interfaces
+ 4
+ {$SNMP_COMMUNITY}
+ discovery[{#SNMPVALUE},IF-MIB::ifDescr]
+ ifDescr
+ 3600
+ 0
+
+
+
+ 0
+ 0
+
+ 0
+
+
+
+
+ 0
+
+
+
+
+
+
+ 0
+
+
+
+ 30
+ You may also consider using IF-MIB::ifType or IF-MIB::ifAlias for discovery depending on your filtering needs.
+
+{$SNMP_COMMUNITY} is a global macro.
+
+
+ Alias of interface $1
+ 4
+ {$SNMP_COMMUNITY}
+ 0
+ IF-MIB::ifAlias.{#SNMPINDEX}
+ ifAlias[{#SNMPVALUE}]
+ 3600
+ 7
+ 0
+ 0
+ 1
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ 0
+
+
+ Interfaces
+
+
+
+
+
+
+
+ Incoming traffic on interface $1
+ 4
+ {$SNMP_COMMUNITY}
+ 1
+ IF-MIB::ifInOctets.{#SNMPINDEX}
+ ifInOctets[{#SNMPVALUE}]
+ 60
+ 7
+ 365
+ 0
+ 3
+
+ bps
+ 1
+
+
+ 0
+ 0
+
+ 0
+
+ 8
+
+
+
+ 0
+ 0
+
+
+
+
+
+ The number of octets in valid MAC frames received on this interface, including the MAC header and FCS.
+ 0
+
+
+ Interfaces
+
+
+
+
+
+
+
+ Operational status of interface $1
+ 4
+ {$SNMP_COMMUNITY}
+ 0
+ IF-MIB::ifOperStatus.{#SNMPINDEX}
+ ifOperStatus[{#SNMPVALUE}]
+ 60
+ 7
+ 365
+ 0
+ 3
+
+
+ 0
+
+
+ 0
+ 0
+
+ 0
+
+ 1
+
+
+
+ 0
+ 0
+
+
+
+
+
+ The current operational state of the interface.
+ 0
+
+
+ Interfaces
+
+
+
+ SNMP interface status (ifOperStatus)
+
+
+
+
+
+ Outgoing traffic on interface $1
+ 4
+ {$SNMP_COMMUNITY}
+ 1
+ IF-MIB::ifOutOctets.{#SNMPINDEX}
+ ifOutOctets[{#SNMPVALUE}]
+ 60
+ 7
+ 365
+ 0
+ 3
+
+ bps
+ 1
+
+
+ 0
+ 0
+
+ 0
+
+ 8
+
+
+
+ 0
+ 0
+
+
+
+
+
+ The number of octets transmitted in MAC frames on this interface, including the MAC header and FCS.
+ 0
+
+
+ Interfaces
+
+
+
+
+
+
+
+
+
+ {SNMPv2 NetworkInterfaces:ifOperStatus[{#SNMPVALUE}].last()}=2 and {SNMPv2 NetworkInterfaces:ifAlias[{#SNMPVALUE}].str(this_does_not_exist)}=0
+ Linkverlust {#SNMPVALUE}
+
+ 1
+ 2
+
+ 0
+
+
+
+ {SNMPv2 NetworkInterfaces:ifOperStatus[{#SNMPVALUE}].diff(0)}=1
+ Operational status was changed on {HOST.NAME} interface {#SNMPVALUE}
+
+ 1
+ 1
+
+ 0
+
+
+
+
+
+ Traffic on interface {#SNMPVALUE}
+ 900
+ 200
+ 0.0000
+ 100.0000
+ 1
+ 1
+ 0
+ 1
+ 0
+ 0.0000
+ 0.0000
+ 0
+ 0
+ 0
+ 0
+
+
+ 0
+ 5
+ 00AA00
+ 0
+ 2
+ 0
+ -
+ SNMPv2 NetworkInterfaces
+ ifInOctets[{#SNMPVALUE}]
+
+
+
+ 1
+ 5
+ 3333FF
+ 0
+ 2
+ 0
+ -
+ SNMPv2 NetworkInterfaces
+ ifOutOctets[{#SNMPVALUE}]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SNMP interface status (ifOperStatus)
+
+
+ 1
+ up
+
+
+ 2
+ down
+
+
+ 3
+ testing
+
+
+ 4
+ unknown
+
+
+ 5
+ dormant
+
+
+ 6
+ notPresent
+
+
+ 7
+ lowerLayerDown
+
+
+
+
+