Augment event arguments
Removes crappy API; specs