Improve performance of ScheduleBuilder