Move towards using the new scheduler classes