Added methods in eventhandler