Switched to using the @EventHandler annotation, re-enabled tools