Update UnitsBased for proper enums