Added additional parameters to events.
Partially model implemented.