Changed name to unit_type for clarity