Scheduled services refactoring