diff --git a/components/report-engine/pom.xml b/components/report-engine/pom.xml
index 4b5f2e0..d9acdb2 100644
--- a/components/report-engine/pom.xml
+++ b/components/report-engine/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2telco.analytics.hub</artifactId>
         <groupId>org.wso2telco.analytics</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/report-engine/src/main/java/org/wso2telco/analytics/hub/report/engine/internel/util/CSVWriter.java b/components/report-engine/src/main/java/org/wso2telco/analytics/hub/report/engine/internel/util/CSVWriter.java
index aa8faed..a323835 100644
--- a/components/report-engine/src/main/java/org/wso2telco/analytics/hub/report/engine/internel/util/CSVWriter.java
+++ b/components/report-engine/src/main/java/org/wso2telco/analytics/hub/report/engine/internel/util/CSVWriter.java
@@ -88,11 +88,16 @@ public static void writeTrafficCSV(List<Record> records, int bufSize, String fil
         if (records.size() > 0) {
             for (Record record : records) {
                 String key = record.getValues().get("api").toString();
-                if (apiCount.containsKey(key)) {
+                if (apiCount.containsKey(key) && record.getValues().containsKey("totalFailureCount")) {
+                    count = apiCount.get(key) + Integer.parseInt(record.getValue("totalFailureCount").toString());
+                } else if (!apiCount.containsKey(key) && record.getValues().containsKey("totalFailureCount")) {
+                    count = Integer.parseInt(record.getValues().get("totalFailureCount").toString());
+                } else if (apiCount.containsKey(key)) {
                     count = apiCount.get(key) + Integer.parseInt(record.getValues().get("totalCount").toString());
                 } else {
                     count = Integer.parseInt(record.getValues().get("totalCount").toString());
                 }
+
                 apiCount.put(key, count);
             }
         }
diff --git a/components/report-generator-extension/pom.xml b/components/report-generator-extension/pom.xml
index 7212470..c5b40ef 100644
--- a/components/report-generator-extension/pom.xml
+++ b/components/report-generator-extension/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2telco.analytics</groupId>
 	<artifactId>org.wso2telco.analytics.hub</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/hub-authentication-artifacts/pom.xml b/features/hub-authentication-artifacts/pom.xml
index 4db3296..686fc63 100644
--- a/features/hub-authentication-artifacts/pom.xml
+++ b/features/hub-authentication-artifacts/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.wso2telco.analytics.hub</artifactId>
         <groupId>org.wso2telco.analytics</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/report-generator-artifacts/pom.xml b/features/report-generator-artifacts/pom.xml
index b55897f..5ec84fc 100644
--- a/features/report-generator-artifacts/pom.xml
+++ b/features/report-generator-artifacts/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.wso2telco.analytics.hub</artifactId>
         <groupId>org.wso2telco.analytics</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 05d2076..c3a75f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <groupId>org.wso2telco.analytics</groupId>
     <artifactId>org.wso2telco.analytics.hub</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <modules>
         <module>components/report-generator-extension</module>
         <module>components/report-engine</module>
@@ -460,7 +460,7 @@
         <url>https://github.com/WSO2Telco/analytics-extgw.git</url>
         <developerConnection>scm:git:https://github.com/WSO2Telco/analytics-extgw.git</developerConnection>
         <connection>scm:git:https://github.com/WSO2Telco/analytics-extgw.git</connection>
-        <tag>HEAD</tag>
+        <tag>v2_0_0</tag>
     </scm>
 
     <profiles>
@@ -493,7 +493,7 @@
 
     <properties>
 
-        <analytics.ids.version>2.0.0-SNAPSHOT</analytics.ids.version>
+        <analytics.ids.version>2.0.0</analytics.ids.version>
         <das.release.version>3.1.0</das.release.version>
 	    <com.jayway.jsonpath.version>0.9.1</com.jayway.jsonpath.version>
 	    <org.wso2.orbit.com.esotericsoftware.kryo.version>2.24.0.wso2v1</org.wso2.orbit.com.esotericsoftware.kryo.version>
diff --git a/product/distribution/pom.xml b/product/distribution/pom.xml
index 15a4acc..20f6e23 100644
--- a/product/distribution/pom.xml
+++ b/product/distribution/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2telco.analytics</groupId>
         <artifactId>org.wso2telco.analytics.hub</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/product/p2-profile-gen/pom.xml b/product/p2-profile-gen/pom.xml
index bbe275e..a303c04 100644
--- a/product/p2-profile-gen/pom.xml
+++ b/product/p2-profile-gen/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2telco.analytics</groupId>
         <artifactId>org.wso2telco.analytics.hub</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>