Mapped default_pickup_location with new codes