Improved CompletionStrategy impl