Refactored Schedule to Plans