Schedule refactor continues