Refactored Schedule call