Adapted new CompletionOptions architecture