PLT-514 Simplify and enhance schedules

Fixup from PR