Added user_id saving