Add constants for events
Use event constants for handlers