Moved listener methods to EventTarget