Reintroduce user_id into events