Updated for schedule validation