added more unit types