Added EventHandler
renamed Core