added support for units and time