Added support for EHDF format