GetUnit and GetSensorType now return enums