Add eventhandler annotations