Switch to using the new @EventHandler annotation