Added support for hm-*-opts attribute
Code clena up