diff --git a/config/simapp.yaml b/config/simapp.yaml
index bc5cb9e..3d1d3c8 100644
--- a/config/simapp.yaml
+++ b/config/simapp.yaml
@@ -1,17 +1,16 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation <info@opennetworking.org>
 #
 # SPDX-License-Identifier: Apache-2.0
-# 
+#
 
+info:
+  description: SIMAPP initial local configuration
+  version: 1.0.0
+  http-version: 1
+logger:
+  APP:
+    debugLevel: info
 configuration:
-  info:
-    description: SIMAPP initial local configuration
-    version: 1.0.0
-    http-version: 1
-  logger:
-    APP:
-      ReportCaller: false
-      debugLevel: info
   subscribers:
   - ueId-start: 123456789123458
     ueId-end: 123456789123458
@@ -62,7 +61,7 @@ configuration:
     slice-id:
       sd: 65565
       sst: 255
-    site-device-group: 
+    site-device-group:
     - "iot-camera"
     application-filtering-rules:
     - rule-name: rule1
@@ -72,7 +71,8 @@ configuration:
       app-mbr-uplink:   100 #100kbps
       app-mbr-downlink: 2000 #2Mbps
       bitrate-unit: Kbps
-      traffic-class : "silver" #if same as APN-AMBR then its default bearer rule
+      traffic-class:
+        name: "silver" #if same as APN-AMBR then its default bearer rule
     - rule-name: rule2
       priority: 15
       action: "permit"
@@ -80,7 +80,7 @@ configuration:
       app-mbr-uplink: 1 #1Mbps
       app-mbr-downlink: 5 #5Mbps
       bitrate-unit: Mbps
-      traffic-class : #if same as APN-AMBR then its default bearer rule
+      traffic-class: #if same as APN-AMBR then its default bearer rule
         name: "silver"
         qci: 9
         arp: 6
@@ -93,13 +93,13 @@ configuration:
       app-mbr-uplink: 120
       app-mbr-downlink: 520
       bitrate-unit: Kbps
-      traffic-class : #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
+      traffic-class: #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
         name: "platinum"
         qci: 9
         arp: 6
         pdb: 300
         pelr: 6
-      rule-trigger: api  #dont create this bearer immediately. Wait for API call 
+      rule-trigger: api  #dont create this bearer immediately. Wait for API call
     - rule-name: rule4
       priority: 35
       action: "permit"
@@ -107,7 +107,7 @@ configuration:
       app-mbr-uplink: 120000
       app-mbr-downlink: 520000
       bitrate-unit: bps
-      traffic-class : #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
+      traffic-class: #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
         name: "gold"
         qci: 9
         arp: 6
@@ -121,7 +121,7 @@ configuration:
       app-mbr-uplink: 120000
       app-mbr-downlink: 520000
       bitrate-unit: bps
-      traffic-class : #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
+      traffic-class: #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
         name: "diamond"
         qci: 9
         arp: 6