Fixed event compile and added handler class