Added unitType to units definitions