Refactoring scheduling and developing CDS