Updated core event system