Move Event Handler into a core event handler