Starting to add more scheduling support