Refactored CompletionContent