Added methods to EventListener