Added location_id to users