Feature/user event integration