Additional changes for new scheduler