Scheduling Api Improvements