Added user_id to events