Add Nagios macros support and use IP addresses as identifiers