Improved handling of units and time.