Renamed type to location_type