Added user_id to locations