Support for new units from units 0.2.1