Expanded the mock scheduler