Add SNMP, refactor other stuff