Updated to support Zabbix 2.0