Event handler definition

[joaoe33]

Currently we are using the Raw version, hence why we are trying to configure the Event Handlers.