Added support for EDL and EHZ meter