Changes for seperate scheduler configuartion