Fixes schedule dependency
Fixes schedules restrictions
merge