diff --git a/.gitignore b/.gitignore
index be275c6..12cd656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,13 @@ build/
 /graalBuild/**
 /GB/
 /GB/*
+/config.xml
+/HotConfig1.xml
+/HotConfig2.xml
+/KeaDisabled.xml
+/KeaEnabled.xml
+/HotConfigCID.xml
+/testCID.sh
+/HotConfigBadIP.xml
+/HotConfigBadMac.xml
+/testNative.sh
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 76c269e..52dce12 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="On explicit save action" serverName="Locak" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true">
+  <component name="PublishConfigData" autoUpload="On explicit save action" serverName="10.10.10.36" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true">
     <option name="confirmBeforeUploading" value="false" />
     <serverData>
-      <paths name="Locak">
+      <paths name="10.10.10.36">
         <serverdata>
           <mappings>
             <mapping deploy="/java/Migration" local="$PROJECT_DIR$" web="/" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d4bed0f..f11feb9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="GraalVM 22" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="GraalVM 22" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index 6357757..46b3cf0 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="WebServers">
     <option name="servers">
-      <webServer id="431922c0-bb3d-417e-8a2a-01234c8fc331" name="Locak">
+      <webServer id="431922c0-bb3d-417e-8a2a-01234c8fc331" name="10.10.10.36">
         <fileTransfer rootFolder="/home/michael" accessType="SFTP" host="10.10.10.36" port="22" sshConfigId="6c19ea50-3b2b-4853-83ab-46b04d9a046f" sshConfig="michael@10.10.10.36:22 password">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
diff --git a/README.md b/README.md
index 1aed0ca..42e8ef0 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,10 @@ Create an Issue or a Pull Request if you want to contribute to the project.
 
 ### Updates
 
+* 2.1.4
+  * Modified handling of ISC DHCP mappings when no MAC address exists where a CID value is provided
+  * Updated the static mapping error messages so that they include relevant details from the static map, making it easier to locate the record for correction 
+ 
 * 2.1.3
   * Minor changes to code structure
  
diff --git a/pom.xml b/pom.xml
index 34b20e8..e94f5f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.simtechdata</groupId>
     <artifactId>Migration</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <packaging>jar</packaging>
 
     <name>Migration</name>
diff --git a/src/main/java/com/simtechdata/App.java b/src/main/java/com/simtechdata/App.java
index 79a2577..c2d8286 100644
--- a/src/main/java/com/simtechdata/App.java
+++ b/src/main/java/com/simtechdata/App.java
@@ -35,16 +35,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static java.lang.StringTemplate.STR;
 
 public class App {
 
     private static final String EXE_FOLDER = System.getProperty("user.dir");
-    private static final Path OUT_FILE     = Paths.get(EXE_FOLDER, "new_config.xml");
-    private static final Path IN_FILE      = Paths.get(EXE_FOLDER, "config.xml");
-    private static final String LF         = System.getProperty("line.separator");
-    private static boolean isCheck         = false;
-    private static boolean debug           = false;
+    private static final Path OUT_FILE = Paths.get(EXE_FOLDER, "new_config.xml");
+    private static final Path IN_FILE = Paths.get(EXE_FOLDER, "config.xml");
+    private static final Path SKIPPED = Paths.get(EXE_FOLDER, "skippedMappings.txt");
+    private static final String NL = System.getProperty("line.separator");
+    private static boolean isCheck = false;
+    private static boolean debug = false;
+    private static final LinkedList<Staticmap> failedStaticmaps = new LinkedList<>();
 
 
     public static void main(String[] args) {
@@ -152,13 +153,13 @@ public static void main(String[] args) {
          * and the import process will be expecting to see a UUID for the record.
          */
 
-        if(debug){
+        if (debug) {
             System.out.println("Old Statics");
         }
 
         List<Reservation> reservationList = new ArrayList<>();
 
-        if(staticMappings.isEmpty()) {
+        if (staticMappings.isEmpty()) {
             System.out.println("Could not find any existing static mappings");
             System.exit(1);
         }
@@ -168,11 +169,12 @@ public static void main(String[] args) {
             for (Staticmap m : staticMappings) {
                 Reservation rsv = new Reservation();
                 String mac = m.getMac();
-                String ipAddy = m.getIpaddr();
-                String description = m.getDescr();
+                String cid = m.getCid();
+                String ipAddy = m.getIpAddress();
+                String description = m.getDescription();
                 String hostname = m.getHostname();
                 String uuid = getUUID();
-                while(uuidSet.contains(uuid))
+                while (uuidSet.contains(uuid))
                     uuid = getUUID();
                 uuidSet.add(uuid);
                 rsv.setUuid(uuid);
@@ -182,7 +184,7 @@ public static void main(String[] args) {
                 rsv.setDescription(description);
                 rsv.setSubnet(getSubnet(ipAddy, subnet4List));
                 reservationList.add(rsv);
-                if(debug) {
+                if (debug) {
                     String dbs = STR."\{ipAddy}\n\{mac}\{hostname}\n\{description}\n";
                     System.out.println(dbs);
                 }
@@ -226,10 +228,26 @@ public static void main(String[] args) {
                 StreamResult result = new StreamResult(writer);
                 transformer.transform(source, result);
                 String pattern = "\\r?\\n\\s+\\r?\\n";
-                String prettyXML = writer.toString().replaceAll(pattern, LF);
+                String prettyXML = writer.toString().replaceAll(pattern, NL);
                 OUT_FILE.toFile().createNewFile();
                 Files.writeString(OUT_FILE, prettyXML, Charset.defaultCharset());
-                System.out.println(Message.SUCCESS);
+                if (!failedStaticmaps.isEmpty()) {
+                    StringBuilder fsb = new StringBuilder(Message.HAS_CID_ONLY());
+                    for (Staticmap staticmap : failedStaticmaps) {
+                        String ipAddress = staticmap.getIpAddress();
+                        String hostname = staticmap.getHostname();
+                        String description = staticmap.getDescription();
+                        fsb.append(Message.EXCLUDED_STATIC_MAPPING(ipAddress, hostname, description));
+                    }
+                    Files.writeString(SKIPPED, fsb.toString(), Charset.defaultCharset());
+                    fsb.append(NL).append("This information has also been saved to this text file for your convenience:");
+                    fsb.append(NL).append(STR."\{NL}\t\{SKIPPED.toFile().getAbsolutePath()}");
+                    fsb.append(NL);
+                    System.out.println(fsb);
+                }
+                else {
+                    System.out.println(Message.SUCCESS);
+                }
                 System.exit(0);
             }
             else {
@@ -274,50 +292,63 @@ private static List<Staticmap> getStaticMappings(NodeList nodeList) {
                     NodeList macNodeList = element.getElementsByTagName("mac");
                     Node macNode = macNodeList.item(0);
 
-                    if (macNodeList == null || macNode == null) {
-                        System.out.println(Message.GENERIC_NODE_NOT_FOUND("<mac>", "mac"));
-                        System.exit(1);
-                    }
+                    NodeList cidNodeList = element.getElementsByTagName("cid");
+                    Node cidNode = cidNodeList.item(0);
 
                     NodeList ipNodeList = element.getElementsByTagName("ipaddr");
                     Node ipNode = ipNodeList.item(0);
 
-                    if (ipNodeList == null || ipNode == null) {
-                        System.out.println(Message.GENERIC_NODE_NOT_FOUND("<ipaddr>", "ip"));
-                        System.exit(1);
-                    }
-
-                    String macAddress = macNode.getTextContent();
-                    String ipAddress = ipNode.getTextContent();
+                    NodeList hostnameNodeList = element.getElementsByTagName("hostname");
+                    Node hostnameNode = hostnameNodeList.item(0);
 
-                    if (!validMac(macAddress)) {
-                        System.out.println(Message.INVALID_MAC_ADDRESS(macAddress));
+                    NodeList descriptionNodeList = element.getElementsByTagName("descr");
+                    Node descriptionNode = descriptionNodeList.item(0);
+
+                    boolean hasMac = macNode != null;
+                    boolean hasCid = cidNode != null;
+                    boolean hasIP = ipNode != null;
+                    boolean hostnameNotNull = hostnameNode != null;
+                    boolean descriptionNotNull = descriptionNode != null;
+
+                    String macAddress = hasMac ? macNode.getTextContent() : "";
+                    String cidString = hasCid ? cidNode.getTextContent() : "";
+                    String ipAddress = hasIP ? ipNode.getTextContent() : "";
+                    String hostname = hostnameNotNull ? hostnameNode.getTextContent() : "";
+                    String description = descriptionNotNull ? descriptionNode.getTextContent() : "";
+
+                    if (!hasIP) {
+                        System.out.println(Message.STATIC_MAP_IP_NOT_FOUND(macAddress, cidString, hostname, description));
                         System.exit(1);
                     }
 
-                    if (!validIPAddress(ipAddress)) {
-                        System.out.println(Message.INVALID_IP_ADDRESS(ipAddress));
+                    if (hasMac && !validMac(macAddress)) {
+                        System.out.println(Message.INVALID_MAC_ADDRESS(macAddress, cidString, hostname, description));
                         System.exit(1);
                     }
 
-                    Staticmap staticmap = new Staticmap(ipAddress, macAddress);
-
-                    if (staticmap == null) {
-                        System.out.println(Message.NULL_STATIC_MAP);
+                    if (hasIP && !validIPAddress(ipAddress)) {
+                        System.out.println(Message.INVALID_IP_ADDRESS(ipAddress));
                         System.exit(1);
                     }
 
-                    NodeList hostnameNodeList = element.getElementsByTagName("hostname");
-                    if (hostnameNodeList.getLength() > 0) {
-                        staticmap.setHostname(hostnameNodeList.item(0).getTextContent());
+                    if (hasIP && hasMac) {
+                        Staticmap staticmap = new Staticmap(macAddress, ipAddress, hostname, description);
+                        staticmaps.addLast(staticmap);
                     }
 
-                    NodeList descriptionNodeList = element.getElementsByTagName("descr");
-                    if (descriptionNodeList.getLength() > 0) {
-                        staticmap.setDescription(descriptionNodeList.item(0).getTextContent());
+                    if (!hasMac) {
+                        if (hasCid) {
+                            Staticmap staticmap = new Staticmap(cidString, ipAddress);
+                            staticmap.setHostname(hostname);
+                            staticmap.setDescription(description);
+                            failedStaticmaps.addLast(staticmap);
+                        }
+                        else {
+                            System.out.println(Message.MAC_CID_NODE_NOT_FOUND(ipAddress, hostname, description));
+                            System.exit(1);
+                        }
                     }
 
-                    staticmaps.add(staticmap);
                 }
                 else {
                     System.out.println(Message.NO_STATIC_MAP);
@@ -378,7 +409,7 @@ private static void processArgs(String[] args) {
                         isCheck = true;
                     }
                     case "v", "version", "--version", "-v", "-version" -> {
-                        System.out.println("2.1.3");
+                        System.out.println("2.1.4");
                         System.exit(0);
                     }
                     case "?", "--help", "-help", "help" -> help();
diff --git a/src/main/java/com/simtechdata/Message.java b/src/main/java/com/simtechdata/Message.java
index 94d8804..343bff5 100644
--- a/src/main/java/com/simtechdata/Message.java
+++ b/src/main/java/com/simtechdata/Message.java
@@ -4,23 +4,23 @@ public class Message {
 
 
     public static final String HELP = """
-                                
+                
                 OPNsense DHCP Static Address Migration
                 --------------------------------------
-                                
+                
                 **** IT IS MANDATORY that you are working with version 24 or later of
                      OPNsense. This tool cannot work using the backup config of an
                      older version of OPNsense.
-                                
+                
                 This is a tool to help you migrate from ISC DHCP server to the newer
                 Kea DHCP Server in OPNsense version 24. It will take the static IP
                 assignments that you currently have and convert them over to the
                 Kea format which you can then import into OPNsense.
-                                
+                
                 For quick documentation, go to https://github.com/EasyG0ing1/Migration
-                                
+                
                 Possible arguments are:
-                                
+                
                 how, --howto    -   Get the detailed steps for doing the migration.
                 v, --version    -   get the version info.
                 ?, --help       -   This help.
@@ -35,7 +35,7 @@ public class Message {
                 **** IT IS MANDATORY that you are working with version 24 or later of
                      OPNsense. This tool cannot work using the backup config of an
                      older version of OPNsense.
-                                
+                
                 1  - In OPNsense, go into Services / Kea DHCP / Kea DHCPv4
                 2  - In the right pane, click on the Subnets tab
                 3  - Create all of your networks subnets and IP Pools
@@ -65,7 +65,7 @@ public class Message {
                                            and therefore, there is nothing to process.
 
                                            Go back into OPNsense and make sure you have existing DHCP static maps in the old DHCP service.
-                                           
+            
                                            If you find that you do in fact have old DHCP static maps to be migrated, then check each one
                                            of them and make sure they have a proper IP address and MAC address assigned to each map.
 
@@ -111,20 +111,20 @@ you created in step one of this process (see migrate --howto). However, even tho
             
                 Run `migrate --howto` for instructions
             
-                        """;
+            """;
 
     public static final String STATIC_MAP_NO_IP = """
             
             Problem:
                 Though your config.xml file has a <staticmap> node, no IP address could be found in a specific map.
-                
+            
             Thoughts:
                 Please go into OPNsense and check all of your static mappings in the old DHCP server to make sure
                 that they at least contain an IP address and a MAC address or simply scroll through your config.xml
                 file and do a search for <staticmap> where each static mapping exists as a complete <staticmap> node
                 so you would expect to see many sections of xml text that are defined by the <staticmap></staticmap>
                 tags. An example of one would look like this:
-                
+            
                 <staticmap>
                 	<mac>cc:cc:10:10:10:11</mac>
                 	<ipaddr>10.10.10.11</ipaddr>
@@ -133,9 +133,9 @@ you created in step one of this process (see migrate --howto). However, even tho
                 	<dnsserver/>
                 	<ntpserver/>
                 </staticmap>
-                
+            
                 What is mandatory in these nodes is that the MAC address and the IP address exist and are accurate.
-                
+            
             """;
 
 
@@ -143,10 +143,10 @@ you created in step one of this process (see migrate --howto). However, even tho
             
             Problem:
                 There was a problem with config.xml.
-                
+            
             Thoughts:
                 You might try obtaining a clean cop from you OPNsense firewall.
-                
+            
             """;
 
 
@@ -155,67 +155,131 @@ you created in step one of this process (see migrate --howto). However, even tho
             Problem:
                 Could not find config.xml, which needs be in the same folder that this program is in
                 and you need to be in that folder when you run migrate.
-                
+            
             Thoughts:
                 Make sure you are in the correct folder and that both the config.xml file and the migrate
                 program are in that folder, then try again.
-                
+            
                 run `migrate --howto` for instructions.
-                
+            
             """;
 
     public static final String CONFIG_NO_STATIC_MAPS = """
             
             Problem:
                 Could not find any static mappings in your config.xml file.
-                
+            
             Thoughts:
                 Go back into OPNsense and make sure you have actual static mappings defined in the old DHCP
                 service then re-create the config.xml file and try again.
-                
+            
                 run `migrate --howto` for instructions.
-                
-                
+            
             """;
 
     public static final String TEMPLATE = """
             
             Problem:
-                
-                
+            
+            
             Thoughts:
-                
+            
 
                 run `migrate --howto` for instructions.
-                
+            
             """;
 
-    public static String GENERIC_NODE_NOT_FOUND(String xmlTag, String discussion) {
+    public static String STATIC_MAP_IP_NOT_FOUND(String macAddress, String CIDString, String hostname, String description) {
+        String mac = macAddress.isEmpty() ? "NONE" : macAddress;
+        String cid = CIDString.isEmpty() ? "NONE" : CIDString;
+        String host = hostname.isEmpty() ? "NONE" : hostname;
+        String desc = description.isEmpty() ? "NONE" : description;
+        return String.format("""
+                                      Problem:
+                                            One of your static mappings does not have an IP Address assigned to it.
+                                     
+                                       Discussion:
+                                            Every static map MUST HAVE an IP address AND a MAC address. Here are the remaining
+                                            details from the static map which might help you locate it in your ISC DHCP
+                                            configuration. Edit the mapping so that it has an IP address and a MAC address then
+                                            start the migration process over again from step 1.
+                                   
+                                            Mac:         %s
+                                            CID:         %s
+                                            Hostname:    %s
+                                            Description: %s
+                                     
+                                     """, mac, cid, host, desc);
+    }
+
+    public static String MAC_CID_NODE_NOT_FOUND(String ipAddress, String hostname, String description) {
+        String ipAddy = ipAddress.isEmpty() ? "NONE" : ipAddress;
+        String host = hostname.isEmpty() ? "NONE" : hostname;
+        String desc = description.isEmpty() ? "NONE" : description;
         return String.format("""
                                       Problem:
-                                            XML Node: %s
-                                            Could not be found
-                                            
+                                            Could not find a Mac address OR a CID value in static mapping.
+                                     
                                        Thoughts:
-                                            This node is supposed to exist within each section in the config.xml file that is tagged
-                                            with <staticmap></staticmap>. Please look through your config.xml file and search for
-                                            `<staticmap` (without the tick marks) and make sure each one has an assigned and valid
-                                             %s address.
-                                                                          
-                                     """, xmlTag, discussion);
+                                            The remaining values for this static mapping are:
+                                     
+                                            IP Address:  %s
+                                            Hostname:    %s
+                                            Description: %s
+                                     
+                                            Every static mapping MUST have a Mac address or there is no way to create an assignment
+                                            for it in Kea DHCP. Please either assign a Mac address to the static mapping or remove the
+                                            static mapping completely from your ISC config, then start the migration process over again
+                                            from step 1.
+                                     
+                                            While looking at your ISC mappings, save time and please make sure that ALL mappings have
+                                            a MAC address.
+                                     
+                                     """, ipAddy, host, desc);
+    }
+
+    public static String HAS_CID_ONLY() {
+        return """
+                                      Problem:
+                                            You have static mappings that only have a CID assigned to them without a MAC address.
+                                            As of April 2024, Kea DHCP server does support either MAC address or CID as a valid
+                                            identifier. However, OPNsense has not yet included the CID feature of Kea DHCP and it is
+                                            assumed that it will be included in a future update.
+                                     
+                                            You have two options if you wish to include these mappings:
+                                     
+                                            1) Proceed with the migration and import new_config.xml into OPNsense, then add these
+                                               mappings manually under Services / Kea DHCP / Kea DHCPv4 / Reservations.
+                                     
+                                            2) Go back into your ISC static mappings and clear the CID value then assign a proper
+                                               MAC address. Once all mappings have been fixed, start the migration process over
+                                               again from step 1.
+                                     
+                                            Here are the static mappings that have NOT been ported to Kea:
+                                     """;
+    }
+
+    public static String EXCLUDED_STATIC_MAPPING(String ipAddress, String hostname, String description) {
+        return String.format("""
+                                     
+                                                IP Address:  %s
+                                                Hostname:    %s
+                                                Description: %s
+                                     
+                                     """, ipAddress, hostname, description);
     }
 
     public static final String NULL_STATIC_MAP = """
             
             Problem:
                 The attempt to instantiate the Java object Staticmap returned a null value.
-                
+            
             Thoughts:
                 This should never happen, but in case it has, create an issue on the Github page
                 for this project.
 
                 run `migrate --howto` for instructions.
-                
+            
             """;
 
     public static String IP_HAS_NO_SUBNET(String ipAddress) {
@@ -223,10 +287,10 @@ public static String IP_HAS_NO_SUBNET(String ipAddress) {
                                       Problem:
                                             IP Address: %s
                                             Has no matching Kea DHCP subnet.
-                                            
+                                     
                                        Thoughts:
                                             Please make sure that the Kea subnets are correctly defined.
-                                            
+                                     
                                             Run `migrate --howto` for instructions.
                                      
                                      """, ipAddress);
@@ -238,34 +302,46 @@ public static String INVALID_IP_ADDRESS(String ipAddress) {
                                       Problem:
                                             IP Address: %s
                                             is NOT A valid IP address, or no address existed in the specific static map.
-                                            
+                                     
                                        Thoughts:
                                             Look through the config.xml file and search for <ipaddr> and see if any of them
                                             are missing values or have an IP address that is incorrect.
-                                        
+                                     
                                      """, ipAddress);
     }
 
 
 
-    public static String INVALID_MAC_ADDRESS(String macAddress) {
+    public static String INVALID_MAC_ADDRESS(String macAddress, String cidString, String hostname, String description) {
+        String mac  = macAddress.isEmpty() ? "NONE" : macAddress;
+        String cid  = cidString.isEmpty() ? "NONE"  : cidString;
+        String host = hostname.isEmpty() ? "NONE"   : hostname;
+        String desc = description.isEmpty() ? "NONE": description;
         return String.format("""
                                       Problem:
                                             MAC Address: %s
                                             is NOT A valid MAC address, or no address existed in the specific static map.
-                                            
+                                     
                                        Thoughts:
-                                            Look through the config.xml file and search for <mac> and see if any of them
-                                            are missing values or have a MAC address that is incorrect. Mac address should
-                                            look like this:
-                                                
+                                            Go into your ISC DHCP static mappings and look for the record that has this
+                                            MAC address. Then correct the problem. Here are the details from the mapping,
+                                            which should help you locate the record:
+
+                                   
+                                            Mac:         %s
+                                            CID:         %s
+                                            Hostname:    %s
+                                            Description: %s
+                                     
+                                            A valid MAC Address looks similar to this:
+                                     
                                                 aa:3f:c2:fd:65:2a
-                                                
+                                     
                                             Where there are six hexadecimal numbers with a colon between them.
-                                            The letters and numbers can only be either 0-9 for numbers and a-f for
-                                            letters. The case of the letter (upper or lower) is not relevant.
-                                        
-                                     """, macAddress);
+                                            The letters can be A through F and the numbers can be 0 through 9.
+                                            The letters are NOT case sensitive (upper and lower case are OK).
+                                     
+                                     """, mac, mac, cid, host, desc);
     }
 
 
@@ -273,12 +349,12 @@ letters. The case of the letter (upper or lower) is not relevant.
             
             Problem:
                 Your config.xml file does not appear to contain the required node called <reservations>
-                
+            
             Thoughts:
                 If you have created your config.xml file with any version of OPNsense that is NOT
                 version 24, then you need to upgrade to version 24 first, then follow the steps
                 to complete your DHCP static map migration.
-                
+            
                 Run `migrate --howto` for instructions.
             
             """;
@@ -293,9 +369,9 @@ letters. The case of the letter (upper or lower) is not relevant.
                 - Click Choose File
                 - Find `new_config.xml` that was just created
                 - Click Restore configuration
-                
+            
                 Done!
-                
+            
             """;
 
     public static final String CREATE_ISSUE = """
diff --git a/src/main/java/com/simtechdata/pojo/Staticmap.java b/src/main/java/com/simtechdata/pojo/Staticmap.java
index a467fa2..b9c283b 100644
--- a/src/main/java/com/simtechdata/pojo/Staticmap.java
+++ b/src/main/java/com/simtechdata/pojo/Staticmap.java
@@ -2,37 +2,37 @@
 
 public class Staticmap {
 
-    public Staticmap(String ipaddr, String mac) {
-        this.ipaddr = ipaddr;
+    public Staticmap(String mac, String ipAddress, String hostname, String description) {
         this.mac = mac;
+        this.cid = "";
+        this.ipAddress = ipAddress;
+        this.hostname = hostname;
+        this.description = description;
+    }
+
+    public Staticmap(String cid, String ipAddress) {
+        this.mac = "";
+        this.cid = cid;
+        this.ipAddress = ipAddress;
     }
 
-    private final String ipaddr;
     private final String mac;
+    private final String cid;
+    private final String ipAddress;
     private String hostname = "";
-    private String descr = "";
+    private String description = "";
 
-    public String getDescr() {
-        return descr;
-    }
+    public void setHostname(String hostname) { this.hostname = hostname; }
 
-    public void setDescription(String descr) {
-        this.descr = descr;
-    }
+    public void setDescription(String descr) { this.description = descr; }
 
-    public String getHostname() {
-        return hostname;
-    }
+    public String getMac() { return mac; }
 
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
+    public String getCid() { return cid; }
 
-    public String getIpaddr() {
-        return ipaddr;
-    }
+    public String getIpAddress() { return ipAddress; }
 
-    public String getMac() {
-        return mac;
-    }
+    public String getHostname() { return hostname; }
+
+    public String getDescription() { return description; }
 }