diff --git a/opensync-ext-cloud/pom.xml b/opensync-ext-cloud/pom.xml
index 51b63f9..1f0b454 100644
--- a/opensync-ext-cloud/pom.xml
+++ b/opensync-ext-cloud/pom.xml
@@ -72,6 +72,12 @@
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
       
+      <dependency>
+        <artifactId>service-metric-models</artifactId>
+        <groupId>com.telecominfraproject.wlan</groupId>
+        <version>${tip-wlan-cloud.release.version}</version>
+      </dependency>      
+
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
@@ -83,12 +89,6 @@
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
-
-      <dependency>
-        <artifactId>client-models</artifactId>
-        <groupId>com.telecominfraproject.wlan</groupId>
-        <version>${tip-wlan-cloud.release.version}</version>
-      </dependency>      
       
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
@@ -108,6 +108,12 @@
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
+      <dependency>
+        <artifactId>client-models</artifactId>
+        <groupId>com.telecominfraproject.wlan</groupId>
+        <version>${tip-wlan-cloud.release.version}</version>
+      </dependency>      
+
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java
index 4045ff8..b6aafac 100644
--- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java
+++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java
@@ -21,7 +21,6 @@ import com.google.protobuf.util.JsonFormat;
 import com.google.protobuf.util.JsonFormat.TypeRegistry;
 import com.telecominfraproject.wlan.client.ClientServiceInterface;
 import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
-import com.telecominfraproject.wlan.client.session.models.AssociationState;
 import com.telecominfraproject.wlan.client.session.models.ClientEapDetails;
 import com.telecominfraproject.wlan.client.session.models.ClientFailureDetails;
 import com.telecominfraproject.wlan.client.session.models.ClientSession;
@@ -50,6 +49,7 @@ import com.telecominfraproject.wlan.servicemetric.apnode.models.ApPerformance;
 import com.telecominfraproject.wlan.servicemetric.apnode.models.DnsProbeMetric;
 import com.telecominfraproject.wlan.servicemetric.apnode.models.EthernetLinkState;
 import com.telecominfraproject.wlan.servicemetric.apnode.models.NetworkProbeMetrics;
+import com.telecominfraproject.wlan.servicemetric.apnode.models.PerProcessUtilization;
 import com.telecominfraproject.wlan.servicemetric.apnode.models.RadioStatistics;
 import com.telecominfraproject.wlan.servicemetric.apnode.models.RadioUtilization;
 import com.telecominfraproject.wlan.servicemetric.apnode.models.StateUpDownError;
@@ -1021,6 +1021,16 @@ public class MqttStatsPublisher {
             }
             apPerformance.setUpTime((long) deviceReport.getUptime());
 
+            List<PerProcessUtilization> cpuPerProcess = new ArrayList<>();
+            deviceReport.getPsCpuUtilList().stream()
+                    .forEach(c -> cpuPerProcess.add(new PerProcessUtilization(c.getPid(), c.getCmd(), c.getUtil())));
+            apPerformance.setPsCpuUtil(cpuPerProcess);
+
+            List<PerProcessUtilization> memPerProcess = new ArrayList<>();
+            deviceReport.getPsMemUtilList().stream()
+                    .forEach(c -> memPerProcess.add(new PerProcessUtilization(c.getPid(), c.getCmd(), c.getUtil())));
+            apPerformance.setPsMemUtil(memPerProcess);
+            
             updateDeviceStatusForReport(customerId, equipmentId, deviceReport, avgRadioTemp);
 
         }
@@ -1784,19 +1794,17 @@ public class MqttStatsPublisher {
 
                                 if (session != null) {
 
-                                        ClientSessionDetails latestSessionDetails = new ClientSessionDetails();
+                                    ClientSessionDetails latestSessionDetails = new ClientSessionDetails();
 
+                                    // could still be values from before
+                                    // disconnect occured.
+                                    latestSessionDetails.setMetricDetails(
+                                            calculateClientSessionMetricDetails(client, clientReport.getTimestampMs()));
 
-                                        // could still be values from before
-                                        // disconnect occured.
-                                        latestSessionDetails.setMetricDetails(calculateClientSessionMetricDetails(
-                                                client, clientReport.getTimestampMs()));
+                                    session.getDetails().mergeSession(latestSessionDetails);
 
-                                        session.getDetails().mergeSession(latestSessionDetails);
+                                    clientServiceInterface.updateSession(session);
 
-                                        clientServiceInterface.updateSession(session);
-
-                                    
                                 }
 
                             }