Added UnitType back