diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc
index cfb02df523..300229564b 100644
--- a/DuetPkg/DuetPkg.dsc
+++ b/DuetPkg/DuetPkg.dsc
@@ -20,6 +20,7 @@
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
@@ -43,16 +44,16 @@
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   TimerLib|DuetPkg/Library/DuetTimerLib/DuetTimerLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  
-  #
-  # To save size, use NULL library for DebugLib and ReportStatusCodeLib.
-  # If need status code output, do library instance overriden as below DxeMain.inf does
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  
   #
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
-  
+  # To save size, use NULL library for DebugLib and ReportStatusCodeLib.
+  # If need status code output, do library instance overriden as below DxeMain.inf does
+  #
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+  
 [LibraryClasses.common.DXE_CORE]
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
   DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
@@ -86,31 +87,31 @@
 
 [Components.common]
   DuetPkg/DxeIpl/DxeIpl.inf {
-    <LibraryClasses>
+    <LibraryClasses>
+      #
+      # If no following overriden for ReportStatusCodeLib library class, 
+      # All other module can *not* output debug information even they are use not NULL library
+      # instance for DebugLib and ReportStatusCodeLib
       #
-      # If no following overriden for ReportStatusCodeLib library class, 
-      # All other module can *not* output debug information even they are use not NULL library
-      # instance for DebugLib and ReportStatusCodeLib
-      #
       ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
   }
 
-  MdeModulePkg/Core/Dxe/DxeMain.inf {
-    #
-    # Enable debug output for DxeCore module, this is a sample for how to enable debug output
-    # for a module. If need turn on debug output for other module, please copy following overriden
-    # PCD and library instance to other module's override section.
-    #
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042
-    <LibraryClasses>
-      DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
-      ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf
-      SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
-  }
-  
+  MdeModulePkg/Core/Dxe/DxeMain.inf {
+    #
+    # Enable debug output for DxeCore module, this is a sample for how to enable debug output
+    # for a module. If need turn on debug output for other module, please copy following overriden
+    # PCD and library instance to other module's override section.
+    #
+    <PcdsFixedAtBuild>
+      gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000042
+    <LibraryClasses>
+      DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+      ReportStatusCodeLib|DuetPkg/Library/DxeCoreReportStatusCodeLibFromHob/DxeCoreReportStatusCodeLibFromHob.inf
+      SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
+  }
+  
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
@@ -179,11 +180,11 @@
 
   # Bios Thunk
   DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
-
-  #
-  # Sample Application
-  #
-  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
+
+  #
+  # Sample Application
+  #
+  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
   
 [Components.IA32]
   DuetPkg/BootSector/BootSector.inf