Added unit conversion behavior. Still needs to be tested though.