diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
index 883c0a5f60..e47dfb795e 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
@@ -2126,7 +2126,7 @@ public class ModuleMain extends IFrame implements MouseListener, TreeSelectionLi
                 for (int indexI = 0; indexI < xmlst.getSystemTableList().size(); indexI++) {
                     dmtnSystemTables
                                     .add(new IDefaultMutableTreeNode(
-                                                                     xmlst.getSystemTableArray(indexI).getEntry(),
+                                                                     xmlst.getSystemTableArray(indexI).getEntryList().get(0),
                                                                      IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM,
                                                                      IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
                                                                      indexI));
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
index aff195ea5b..185ace3493 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
@@ -208,8 +208,8 @@ public class ModuleSystemTables extends IInternalFrame {
         init(inSystemTables);
         this.location = index;
         if (this.systemTables.getSystemTableList().size() > 0) {
-            if (this.systemTables.getSystemTableArray(index).getEntry() != null) {
-                this.jTextFieldEntry.setText(this.systemTables.getSystemTableArray(index).getEntry());
+            if (this.systemTables.getSystemTableArray(index).getEntryList() != null) {
+                this.jTextFieldEntry.setText(this.systemTables.getSystemTableArray(index).getEntryList().get(0));
             }
             if (this.systemTables.getSystemTableArray(index).getUsage() != null) {
                 this.jComboBoxUsage.setSelectedItem(this.systemTables.getSystemTableArray(index).getUsage().toString());
@@ -374,7 +374,7 @@ public class ModuleSystemTables extends IInternalFrame {
             }
             SystemTablesDocument.SystemTables.SystemTable systemTable = SystemTablesDocument.SystemTables.SystemTable.Factory
                                                                                                                              .newInstance();
-            systemTable.setEntry(this.jTextFieldEntry.getText());
+            //systemTable.setEntry(this.jTextFieldEntry.getText());
 
             systemTable.setUsage(SystemTableUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
             if (!isEmpty(this.jTextFieldOverrideID.getText())) {