diff --git a/data_models/data_model_parameters.py b/data_models/data_model_parameters.py
index f211ef3..f1621a9 100644
--- a/data_models/data_model_parameters.py
+++ b/data_models/data_model_parameters.py
@@ -21,7 +21,7 @@
     SW_VERSION = 'SW version'
 
     SERIAL_NUMBER = 'Serial number'
-    CELL_ID = 'Cell ID'
+    CELL_ID = 'cell_id'
     IP_ADDRESS = "ip_address"
 
     # Capabilities
@@ -38,10 +38,12 @@
 
     FREQ_BAND_1 = "frequency_band_1"
     FREQ_BAND_2 = "frequency_band_2"
-    FREQ_BAND_LIST = "freq_band_list"
+    FREQ_BAND_LIST = "frequency_band_list"
 
     BAND = 'Band'
-    PCI = 'PCI'
+    PCI_LIST = 'pci_list'
+    PCI1 = 'pci1'
+    PCI2 = 'pci2'
     DL_BANDWIDTH = 'downlink_bandwidth'
     UL_BANDWIDTH = 'uplink_bandwidth'
     TX_POWER = "tx_power"
@@ -64,15 +66,15 @@
 
     # Cell parameters
     CELL_ENABLE64QAM = "enable64qam"
-    SPECIAL_SUBFRAME_PATTERN = 'subframe_configuration'
+    SPECIAL_SUBFRAME_PATTERN = 'special_subframe_pattern'
     SUBFRAME_ASSIGNMENT = 'subframe_assignment'
 
     # Core network parameters
-    MME_IP = 'MME IP'
-    MME_PORT = 'MME port'
+    MME_ADDRESS = 'mme_address'
+    MME_PORT = 'mme_port'
     NUM_PLMNS = 'Num PLMNs'
     PLMN = 'PLMN'
-    PLMN_LIST = 'PLMN List'
+    PLMN_LIST = 'plmn_list'
 
     # PLMN parameters
     PLMN_N = 'PLMN %d'
@@ -82,7 +84,7 @@
     PLMN_N_PLMNID = 'PLMN %d PLMNID'
 
     # PLMN arrays are added below
-    TAC = 'tac'
+    TAC1 = 'tac1'
     TAC2 = 'tac2'
     IP_SEC_ENABLE = 'ipsec_enable'
     MME_POOL_ENABLE = 'mme_pool_enable'
@@ -126,6 +128,19 @@
     FIRMWARE_URL = "firmware_url"
     FIRMWARE_SIZE = "firmware_size"
 
+    @classmethod
+    def all_paramters(cls):
+        """ Return all possible parameter in the structure """
+        ret_dict = dict()
+        for item in filter(lambda x: x[:2] != "__", cls.__dict__.keys()):
+            if not callable(getattr(cls, item)):
+                # The return format is a reversed dictionary
+                # {'cell_id': 'CELL_ID', ...}
+                ret_dict[getattr(cls, item)] = item
+
+        return ret_dict
+        
+
 
 class TrParameterType():
     BOOLEAN = 'boolean'