added support for more unit measures