diff --git a/sdk/cognitiveservices/pom.service.xml b/sdk/cognitiveservices/pom.service.xml
index 93b202e28b4e9..a27bfbd71d241 100644
--- a/sdk/cognitiveservices/pom.service.xml
+++ b/sdk/cognitiveservices/pom.service.xml
@@ -9,29 +9,23 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>../core/azure-core</module>
-    <module>../core/azure-core-test</module>
-    <module>../core/azure-core-http-netty</module>
-
-    <module>azure-cs-textanalytics</module>
-
-<!--    <module>ms-azure-cs-autosuggest</module>-->
-<!--    <module>ms-azure-cs-computervision</module>-->
-<!--    <module>ms-azure-cs-contentmoderator</module>-->
-<!--    <module>ms-azure-cs-customimagesearch</module>-->
-<!--    <module>ms-azure-cs-customsearch</module>-->
-<!--    <module>ms-azure-cs-customvision-prediction</module>-->
-<!--    <module>ms-azure-cs-customvision-training</module>-->
-<!--    <module>ms-azure-cs-entitysearch</module>-->
-<!--    <module>ms-azure-cs-faceapi</module>-->
-<!--    <module>ms-azure-cs-imagesearch</module>-->
-<!--    <module>ms-azure-cs-luis-authoring</module>-->
-<!--    <module>ms-azure-cs-luis-runtime</module>-->
-<!--    <module>ms-azure-cs-newssearch</module>-->
-<!--    <module>ms-azure-cs-spellcheck</module>-->
-<!--    <module>ms-azure-cs-textanalytics</module>-->
-<!--    <module>ms-azure-cs-videosearch</module>-->
-<!--    <module>ms-azure-cs-visualsearch</module>-->
-<!--    <module>ms-azure-cs-websearch</module>-->
+    <module>ms-azure-cs-autosuggest</module>
+    <module>ms-azure-cs-computervision</module>
+    <module>ms-azure-cs-contentmoderator</module>
+    <module>ms-azure-cs-customimagesearch</module>
+    <module>ms-azure-cs-customsearch</module>
+    <module>ms-azure-cs-customvision-prediction</module>
+    <module>ms-azure-cs-customvision-training</module>
+    <module>ms-azure-cs-entitysearch</module>
+    <module>ms-azure-cs-faceapi</module>
+    <module>ms-azure-cs-imagesearch</module>
+    <module>ms-azure-cs-luis-authoring</module>
+    <module>ms-azure-cs-luis-runtime</module>
+    <module>ms-azure-cs-newssearch</module>
+    <module>ms-azure-cs-spellcheck</module>
+    <module>ms-azure-cs-textanalytics</module>
+    <module>ms-azure-cs-videosearch</module>
+    <module>ms-azure-cs-visualsearch</module>
+    <module>ms-azure-cs-websearch</module>
   </modules>
 </project>
diff --git a/sdk/textanalytics/pom.service.xml b/sdk/textanalytics/pom.service.xml
index 6075a2eb078de..4bea20c1edf3f 100644
--- a/sdk/textanalytics/pom.service.xml
+++ b/sdk/textanalytics/pom.service.xml
@@ -1,17 +1,28 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.azure</groupId>
-  <artifactId>azure-cognitiveservices-textanalytics-service</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <modules>
-    <!-- NOTE: Commenting out becuase we are now binary composed.
-    -->
-    <module>../core/azure-core</module>
-    <module>azure-cs-textanalytics</module>
-  </modules>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<modelVersion>4.0.0</modelVersion>
+<groupId>com.azure</groupId>
+<artifactId>azure-cognitiveservices-textanalytics-service</artifactId>
+<packaging>pom</packaging>
+<version>1.0.0</version>  <!-- Need not change for every release-->
+<profiles>
+  <profile>
+    <id>client</id>
+    <activation>
+      <property>
+        <name>env.SDKTYPE</name>
+        <value>!data</value>
+      </property>
+    </activation>
+    <modules>
+      <module>../core/azure-core</module>
+      <module>../core/azure-core-test</module>
+      <module>../core/azure-core-http-netty</module>
+      <module>../identity/azure-identity</module>
+      <module>azure-cs-textanalytics</module>
+    </modules>
+  </profile>
+</profiles>
 </project>