Changed event handlers to use @SubscribeEvent