Updated events module

Signed-off-by: Jesse Dobbelaere <jesse@dobbelaere-ae.be>