Implemented EventListener Interface: Fix #1