Adding some more functionality to deal with scheduling of jobs