Added support for schedules