Schedules Enhancements