Add methods for EventHandler.java