Extra params
Merge branch 'extra_event_params'