Simplify custom events listening