Added parameters to events controller.
Resolve merge conflict.