Finished version which can be included in OpenNMS