Initial changes for supporting Schedule mode and fixes for Git Issues 10 and 11