OnEvent mixin added