Schedule refactor