diff --git a/Jenkinsfile b/Jenkinsfile
index cc09674..c57f32c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,10 +10,10 @@ def tag() {
     echo "Set release version to ${releaseVersion}"
 
     withCredentials([usernamePassword(credentialsId: 'c2cce724-a831-4ec8-82b1-73d28d1c367a', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
-        sh('git fetch https://${GIT_USERNAME}:${GIT_PASSWORD}@bitbucket.org/telestax/retcomm-jmx-monitoring.git')
+        sh('git fetch https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/RestComm/PerfCorder.git')
         sh("git commit -a -m \"New release candidate ${releaseVersion}\"")
         sh("git tag ${releaseVersion}")
-        sh('git push https://${GIT_USERNAME}:${GIT_PASSWORD}@bitbucket.org/telestax/retcomm-jmx-monitoring.git --tags')
+        sh('git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/RestComm/PerfCorder.git --tags')
     }
 }
 
@@ -21,10 +21,10 @@ def version() {
     def newVersion = "${MAJOR_VERSION_NUMBER}"
     if (BRANCH_NAME != "master") {
         newVersion = "${MAJOR_VERSION_NUMBER}-${BRANCH_NAME}"
-    }   
+    }
     currentBuild.displayName = "#${BUILD_NUMBER}-${newVersion}"
     sh "mvn -B versions:set -DnewVersion=${newVersion} versions:commit"
-    
+
 }
 
 def isSnapshot() {
@@ -32,12 +32,12 @@ def isSnapshot() {
 }
 
 node("cxs-slave-master") {
-    properties([[$class: 'DatadogJobProperty', tagFile: '', tagProperties: ''], 
+    properties([[$class: 'DatadogJobProperty', tagFile: '', tagProperties: ''],
         parameters([
             string(defaultValue: '1.1.0-SNAPSHOT', description: 'Snapshots will skip Tag stage', name: 'MAJOR_VERSION_NUMBER', trim: false),
             string(defaultValue: 'regular', description: 'docs,release,docker', name: 'MVN_PROFILES', trim: false)
         ])
-    ]) 
+    ])
 
     if (isSnapshot()) {
         echo "SNAPSHOT detected, skip Tag stage"
diff --git a/src/main/resources/defaultFileTargets.xml b/src/main/resources/defaultFileTargets.xml
index d3b5a19..302ea96 100644
--- a/src/main/resources/defaultFileTargets.xml
+++ b/src/main/resources/defaultFileTargets.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><analysisFileTargetSet>  
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><analysisFileTargetSet>
     <files>
         <category>Sys</category>
         <csvTargets>
@@ -24,101 +24,101 @@
             <label>SysCpuWai</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>3</column>
-        </csvTargets>  
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysCpuHiq</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>4</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysCpuSiq</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>5</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysNetRecv</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>6</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysNetSend</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>7</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysDiskRead</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>8</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysDiskWrit</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>9</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysSysInt</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>10</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysSysCsw</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>11</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysTcpLis</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>12</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysTcpAct</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>13</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysTcpSyn</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>14</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysTcpTim</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>15</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysTcpClo</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>16</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysUdpLis</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>17</column>
-        </csvTargets>                          
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SysUdpAct</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>18</column>
-        </csvTargets>                          
+        </csvTargets>
         <linesToSkip>6</linesToSkip>
         <path>data/periodic/sys/dstat.csv</path>
         <separator>44</separator>
-    </files>    
+    </files>
     <files>
         <category>Java</category>
         <csvTargets>
@@ -138,7 +138,7 @@
             <label>JavaThreads</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>3</column>
-        </csvTargets>        
+        </csvTargets>
         <linesToSkip>1</linesToSkip>
         <path>data/periodic/java/jvmtop.txt</path>
         <separator>44</separator>
@@ -168,25 +168,25 @@
             <label>PrefixThreadsRUNNABLE</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>4</column>
-        </csvTargets> 
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>PrefixThreadsBLOCKED</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>5</column>
-        </csvTargets>                       
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>PrefixThreadsTERMINATED</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>6</column>
-        </csvTargets> 
-        
-                                   
+        </csvTargets>
+
+
         <linesToSkip>1</linesToSkip>
         <path>data/periodic/java/prefixThreads.csv</path>
         <separator>59</separator>
-    </files>      
+    </files>
     <files>
         <category>Threads</category>
         <csvTargets>
@@ -212,25 +212,25 @@
             <label>ThreadsRUNNABLE</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>4</column>
-        </csvTargets> 
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>ThreadsBLOCKED</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>5</column>
-        </csvTargets>                       
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>ThreadsTERMINATED</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>6</column>
-        </csvTargets> 
-        
-                                   
+        </csvTargets>
+
+
         <linesToSkip>1</linesToSkip>
         <path>data/periodic/java/threads.csv</path>
         <separator>59</separator>
-    </files>    
+    </files>
     <files>
         <category>SIP</category>
         <csvTargets>
@@ -238,56 +238,56 @@
             <label>SIPTotalCallCreated</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>TotalCallCreated</columnName>              
+            <columnName>TotalCallCreated</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SIPCurrentCall</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CurrentCall</columnName>             
+            <columnName>CurrentCall</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SIPSuccessCalls</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>SuccessfulCall(C)</columnName>             
+            <columnName>SuccessfulCall(C)</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SIPFailedCalls</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>FailedCall(P)</columnName> 
+            <columnName>FailedCall(P)</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SIPRetransmissions</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>Retransmissions(P)</columnName> 
+            <columnName>Retransmissions(P)</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.SIPPTimeConverter</converterClass>
             <label>SIPResponseTime1</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>ResponseTime1(P)</columnName> 
+            <columnName>ResponseTime1(P)</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.SIPPTimeConverter</converterClass>
             <label>SIPResponseTime2</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>ResponseTime2(P)</columnName> 
+            <columnName>ResponseTime2(P)</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.SIPPTimeConverter</converterClass>
             <label>SIPCallLength</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CallLength(P)</columnName> 
+            <columnName>CallLength(P)</columnName>
         </csvTargets>
         <linesToSkip>0</linesToSkip>
         <path>data/periodic/sip/sipp.csv</path>
@@ -300,21 +300,21 @@
             <label>DiameterInitSuccessfulCall</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-           <columnName>InitSuccessfulCall(P)</columnName>              
-        </csvTargets>        
+           <columnName>InitSuccessfulCall(P)</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>DiameterTrafficSuccessfulCall</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-           <columnName>TrafficSuccessfulCall(P)</columnName>              
+           <columnName>TrafficSuccessfulCall(P)</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>DiameterFailedCall</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>FailedCall(P)</columnName>            
+            <columnName>FailedCall(P)</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.SIPPTimeConverter</converterClass>
@@ -326,7 +326,7 @@
         <linesToSkip>0</linesToSkip>
         <path>data/periodic/diameter/seagull-client-stat.csv</path>
         <separator>59</separator>
-    </files>    
+    </files>
     <files>
         <category>Java</category>
         <csvTargets>
@@ -381,7 +381,7 @@
         <path>data/periodic/java/histo.csv</path>
         <separator>44</separator>
     </files>
-    
+
     <files>
         <category>MAP</category>
         <csvTargets>
@@ -389,27 +389,27 @@
             <label>MAPCreatedScenario</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CreatedScenario</columnName> 
+            <columnName>CreatedScenario</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>MAPFailedScenario</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>FailedScenario</columnName> 
+            <columnName>FailedScenario</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>MAPCompletedScenario</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CompletedScenario</columnName> 
-        </csvTargets>                  
+            <columnName>CompletedScenario</columnName>
+        </csvTargets>
         <linesToSkip>0</linesToSkip>
         <path>data/periodic/map/mapp.csv</path>
         <separator>59</separator>
-    </files>   
-    
+    </files>
+
     <files>
         <category>SMPP</category>
         <csvTargets>
@@ -417,34 +417,65 @@
             <label>SMPPCreatedScenario</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CreatedScenario</columnName> 
+            <columnName>CreatedScenario</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SMPPFailedScenario</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>FailedScenario</columnName> 
+            <columnName>FailedScenario</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SMPPCompletedScenario</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CompletedScenario</columnName> 
-        </csvTargets>      
+            <columnName>CompletedScenario</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>SMPPResponseTime1</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>ResponseTime1</columnName> 
-        </csvTargets>                            
+            <columnName>ResponseTime1</columnName>
+        </csvTargets>
+        <csvTargets>
+            <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
+            <label>SmppSampleCount</label>
+            <auxTimestampColumn>-1</auxTimestampColumn>
+            <column>-1</column>
+        </csvTargets>
+        <csvTargets>
+            <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
+            <label>SMPPSendSampleCount</label>
+            <auxTimestampColumn>-1</auxTimestampColumn>
+            <column>-1</column>
+        </csvTargets>
         <linesToSkip>0</linesToSkip>
         <path>data/periodic/smpp/smppp.csv</path>
         <separator>59</separator>
     </files>
-    
+
+    <files>
+        <category>XMPP</category>
+        <csvTargets>
+            <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
+            <label>XmppSampleCount</label>
+            <auxTimestampColumn>-1</auxTimestampColumn>
+            <column>-1</column>
+        </csvTargets>
+        <csvTargets>
+            <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
+            <label>XMPPRcvdSampleCount</label>
+            <auxTimestampColumn>-1</auxTimestampColumn>
+            <column>-1</column>
+        </csvTargets>
+        <linesToSkip>0</linesToSkip>
+        <path>data/periodic/xmpp/xmppp.csv</path>
+        <separator>59</separator>
+    </files>
+
     <files>
         <category>JMX</category>
         <csvTargets>
@@ -452,69 +483,69 @@
             <label>JMXRouterActivitiesMapped</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>ActivitiesMapped</columnName> 
+            <columnName>ActivitiesMapped</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXRouterAverageEventRoutingTime</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>AverageEventRoutingTime</columnName> 
+            <columnName>AverageEventRoutingTime</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXRouterExecutedTasks</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>ExecutedTasks</columnName> 
-        </csvTargets>      
+            <columnName>ExecutedTasks</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXRouterMiscTasksExecuted</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>MiscTasksExecuted</columnName> 
-        </csvTargets>     
-        
+            <columnName>MiscTasksExecuted</columnName>
+        </csvTargets>
+
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXRouterWorkingQueueSize</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>WorkingQueueSize</columnName> 
-        </csvTargets> 
+            <columnName>WorkingQueueSize</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXgetExecutedTasks0</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>getExecutedTasks0</columnName> 
-        </csvTargets>  
+            <columnName>getExecutedTasks0</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXgetExecutedTasks1</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>getExecutedTasks1</columnName> 
-        </csvTargets>  
+            <columnName>getExecutedTasks1</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXgetExecutedTasks2</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>getExecutedTasks2</columnName> 
-        </csvTargets>  
+            <columnName>getExecutedTasks2</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>JMXgetExecutedTasks3</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>getExecutedTasks3</columnName> 
-        </csvTargets>                                                                               
+            <columnName>getExecutedTasks3</columnName>
+        </csvTargets>
         <linesToSkip>0</linesToSkip>
         <path>data/periodic/java/jmx2csv.csv</path>
         <separator>44</separator>
-    </files>  
+    </files>
     <files>
         <category>TCAP</category>
         <csvTargets>
@@ -522,36 +553,36 @@
             <label>TCAPCreatedIncomingDialogs</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CreatedIncomingDialogs</columnName> 
+            <columnName>CreatedIncomingDialogs</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>TCAPSuccessfulOutgoingDialogs</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>SuccessfulOutgoingDialogs</columnName> 
+            <columnName>SuccessfulOutgoingDialogs</columnName>
         </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>TCAPCreatedOutgoingDialogs</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>CreatedOutgoingDialogs</columnName> 
-        </csvTargets>      
+            <columnName>CreatedOutgoingDialogs</columnName>
+        </csvTargets>
         <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>TCAPSuccessfulIncomingDialogs1</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>SuccessfulIncomingDialogs1</columnName> 
+            <columnName>SuccessfulIncomingDialogs1</columnName>
         </csvTargets>
          <csvTargets>
             <converterClass>org.restcomm.perfcorder.analyzer.DefaultConverter</converterClass>
             <label>TCAPSuccessfulIncomingDialogs2</label>
             <auxTimestampColumn>-1</auxTimestampColumn>
             <column>-1</column>
-            <columnName>SuccessfulIncomingDialogs2</columnName> 
-        </csvTargets>                         
+            <columnName>SuccessfulIncomingDialogs2</columnName>
+        </csvTargets>
         <linesToSkip>0</linesToSkip>
         <path>data/periodic/tcap/tcap.csv</path>
         <separator>59</separator>
diff --git a/src/main/resources/pc_start_collect.sh b/src/main/resources/pc_start_collect.sh
index b564417..b36db8f 100644
--- a/src/main/resources/pc_start_collect.sh
+++ b/src/main/resources/pc_start_collect.sh
@@ -41,6 +41,7 @@ function prepareCollectionOutputDirs {
     mkdir -p ${SIP_COLLECTION_DIR}
     mkdir -p ${HTTP_COLLECTION_DIR}
     mkdir -p ${SMPP_COLLECTION_DIR}
+    mkdir -p ${XMPP_COLLECTION_DIR}
     mkdir -p ${DIAMETER_COLLECTION_DIR}
     mkdir -p ${MAP_COLLECTION_DIR}
     mkdir -p ${TCAP_COLLECTION_DIR}
@@ -57,8 +58,8 @@ function collectConfUsed {
 function collectJavaProcessInfo {
     echo Collect Java Process Info
 
-    set > ${META_COLLECTION_DIR}/envVars.txt  
-   
+    set > ${META_COLLECTION_DIR}/envVars.txt
+
     ps -f -p ${JAVA_PID} >${META_COLLECTION_DIR}\jvmoptions.txt
 
     $JAVA_HOME/bin/java $JAVA_OPTS -cp $CLASSPATH org.restcomm.perfcorder.collector.VMInfoPrinter ${JAVA_PID} > ${META_COLLECTION_DIR}/jvmdump.txt
@@ -107,7 +108,7 @@ function startJavaMeasCollection {
     echo $! > ${DATA_COLLECTION_DIR}/threads.pid
     if [[ -z ${THREAD_PREFIX_FILTER} ]]; then
         echo Thread prefix disabled
-    else 
+    else
         echo Thread prefix enabled
         $JAVA_HOME/bin/java $JAVA_OPTS -cp $CLASSPATH org.restcomm.perfcorder.collector.ThreadStatApp -d ${MEAS_INTERVAL_SECONDS} -f ${THREAD_PREFIX_FILTER} ${JAVA_PID} > ${JAVA_COLLECTION_DIR}/prefixThreads.csv &
         echo $! > ${DATA_COLLECTION_DIR}/prefixThreads.pid
@@ -117,7 +118,7 @@ function startJavaMeasCollection {
 function startNetworkCapture {
     if [[ -z ${PC_NETWORK_CAPTURE} ]]; then
         echo Network capture disabled
-    else 
+    else
         echo Network capture enabled
         #allow tshark to save in the file run by root
         touch ${SYS_COLLECTION_DIR}/net.pcap
@@ -133,7 +134,7 @@ function invokeExternalHook {
     else
         echo "Invoke External Hook at:$INVOKE_EXTERNAL_HOOK"
         bash $INVOKE_EXTERNAL_HOOK
-    fi  
+    fi
 }
 
 function startCollection {
@@ -187,7 +188,7 @@ function takeSnapshot {
 
     echo "Discarding old snapshot"
     find /path/to/your/dir/tree -atime +XXX -exec rm {}\;
- 
+
 
 
     echo "Resuming Collection"
@@ -285,7 +286,7 @@ fi
 
 if [[ -z ${PERFCORDER_HOME} ]]; then
     DIR=$( cd $(dirname $0) ; pwd -P )
-else 
+else
     DIR=$PERFCORDER_HOME
 fi
 
@@ -302,10 +303,11 @@ SYS_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/sys
 SIP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/sip
 HTTP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/http
 SMPP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/smpp
+XMPP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/xmpp
 MAP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/map
 TCAP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/tcap
 DIAMETER_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/diameter
-    
+
 ANALYSIS_GENERATION_DIR=${OUTPUT_DIR}/analysis
 GRAPHS_DIR=${ANALYSIS_GENERATION_DIR}/graphs
 STATS_DIR=${ANALYSIS_GENERATION_DIR}/stats
diff --git a/src/main/resources/pc_start_remote_monitor.sh b/src/main/resources/pc_start_remote_monitor.sh
index b8c95f2..ef2c4e9 100644
--- a/src/main/resources/pc_start_remote_monitor.sh
+++ b/src/main/resources/pc_start_remote_monitor.sh
@@ -57,7 +57,7 @@ function startJavaMeasCollection {
     echo $! > ${DATA_COLLECTION_DIR}/threads.pid
     if [[ -z ${THREAD_PREFIX_FILTER} ]]; then
         echo Thread prefix disabled
-    else 
+    else
         echo Thread prefix enabled
         $JAVA_HOME/bin/java $JAVA_OPTS -cp $CLASSPATH org.restcomm.perfcorder.collector.ThreadStatApp -d ${MEAS_INTERVAL_SECONDS} -f ${THREAD_PREFIX_FILTER} ${JAVA_PID} > ${JAVA_COLLECTION_DIR}/prefixThreads.csv &
         echo $! > ${DATA_COLLECTION_DIR}/prefixThreads.pid
@@ -71,7 +71,7 @@ function invokeExternalHook {
     else
         echo "Invoke External Hook at:$INVOKE_EXTERNAL_HOOK"
         bash $INVOKE_EXTERNAL_HOOK
-    fi  
+    fi
 }
 
 function startCollection {
@@ -115,7 +115,7 @@ function takeSnapshot {
 
     echo "Discarding old snapshot"
     find /path/to/your/dir/tree -atime +XXX -exec rm {}\;
- 
+
 
 
     echo "Resuming Collection"
@@ -205,7 +205,7 @@ fi
 
 if [[ -z ${PERFCORDER_HOME} ]]; then
     DIR=$( cd $(dirname $0) ; pwd -P )
-else 
+else
     DIR=$PERFCORDER_HOME
 fi
 
@@ -222,10 +222,11 @@ SYS_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/sys
 SIP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/sip
 HTTP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/http
 SMPP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/smpp
+XMPP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/xmpp
 MAP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/map
 TCAP_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/tcap
 DIAMETER_COLLECTION_DIR=${PERIODIC_COLLECTION_DIR}/diameter
-    
+
 ANALYSIS_GENERATION_DIR=${OUTPUT_DIR}/analysis
 GRAPHS_DIR=${ANALYSIS_GENERATION_DIR}/graphs
 STATS_DIR=${ANALYSIS_GENERATION_DIR}/stats