EventScheduler improvements