Make changes for ROW scheduler