more changes for scheduling engine

more changes for scheduling engine