Made unit types changeable