Reflect UnifiedNlp changes