Fixing hardcoded scheduler in CreateClient()