Scheduling API - Imrovements