diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
index f688a19458..afc35028ea 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>
     <Abstract>Component description file for ConSplitter module.</Abstract>
     <Description>Any Handle that attatched EFI_CONSOLE_IDENTIFIER_PROTOCOL can be bound by this driver.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +22,9 @@
     <OutputFileBasename>ConSplitter</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverModelLib</Keyword>
@@ -58,19 +59,21 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
   </PackageDependencies>
   <Protocols>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>
+      <HelpText>UGA Draw protocol is only installed in EFI mode.</HelpText>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>
+      <HelpText>Graphics Output Protocol is only installed in UEFI mode.</HelpText>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="ALWAYS_CONSUMED">
+    <Protocol Usage="ALWAYS_PRODUCED">
       <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_PRODUCED">
diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
index 3e9af8001b..187cc9b4ec 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>GraphicsConsole</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
@@ -7,7 +7,7 @@
     <Version>1.0</Version>
     <Abstract>Component description file for GraphicsConsole module</Abstract>
     <Description>This is the main routine for initializing the Graphics Console support routines.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +22,9 @@
     <OutputFileBasename>GraphicsConsole</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverModelLib</Keyword>
@@ -31,9 +32,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiLib</Keyword>
     </LibraryClass>
@@ -73,10 +71,16 @@
     <Protocol Usage="BY_START">
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
-    <Protocol Usage="TO_START">
+    <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
+  <HiiPackages>
+    <HiiPackage Usage="ALWAYS_PRODUCED">
+      <HiiCName>FontPack</HiiCName>
+      <HelpText>Register UsStdNarrow Fonts into the global database.</HelpText>
+    </HiiPackage>
+  </HiiPackages>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
index 977a9b355e..3403b35b75 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
@@ -6,8 +6,8 @@
     <GuidValue>9E863906-A40F-4875-977F-5B93FF237FC6</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for Terminal module.</Abstract>
-    <Description>This drivre installs Simple Text In/Out protocol for terminal devices.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>This driver installs Simple Text In/Out protocol for terminal devices.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +22,9 @@
     <OutputFileBasename>Terminal</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverModelLib</Keyword>
@@ -83,15 +84,18 @@
   <Variables>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gConInDevGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ConInDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gConOutDevGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ConOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gErrOutDevGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ErrOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
   </Variables>
   <Guids>
diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa
index ffe09f9552..043cd1d657 100644
--- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa
+++ b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>DataHub</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
     <GuidValue>53BCC14F-C24F-434C-B294-8ED2D4CC1860</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for DataHub module.</Abstract>
-    <Description>This driver preloads the data hub with status information copied in from PEI HOBs and produces the Data Hub protocol.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>This driver initializes and installs the Data Hub protocol.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +22,9 @@
     <OutputFileBasename>DataHub</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
@@ -54,7 +55,6 @@
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="ALWAYS_PRODUCED">
diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa
index 0a8108301d..1c934c6f2e 100644
--- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa
+++ b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>DataHubStdErr</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
@@ -7,7 +7,7 @@
     <Version>1.0</Version>
     <Abstract>Component description file for Data Hub filter driver.</Abstract>
     <Description>This driver takes DEBUG () info from Data Hub and writes it to StdErr if it exists.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +22,9 @@
     <OutputFileBasename>DataHubStdErr</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverEntryPoint</Keyword>
@@ -48,6 +49,12 @@
       <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
+  <DataHubs>
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">
+      <DataHubCName>DATA_HUB_STATUS_CODE_DATA_RECORD</DataHubCName>
+      <HelpText>DEBUG() data that is recorded in status code data hub will be sent to Standard Error.</HelpText>
+    </DataHubRecord>
+  </DataHubs>
   <Guids>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
       <GuidCName>gEfiStatusCodeGuid</GuidCName>
diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
index f2c09b9c9d..3e4ef3ceeb 100644
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
+++ b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>DebugPort</ModuleName>
     <ModuleType>UEFI_DRIVER</ModuleType>
     <GuidValue>73E9457A-CEA1-4917-9A9C-9F1F0F0FD322</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for DebugPort module.</Abstract>
-    <Description>This driver produces DebugPort Protocol based on SerialIo.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>This driver binds exclusively to serial io on the controller handle, 
+      and initializes serial Io interface, publishs DebugPort and device path Protocol.</Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
       which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +23,9 @@
     <OutputFileBasename>DebugPort</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">
       <Keyword>DebugLib</Keyword>
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiDriverModelLib</Keyword>
@@ -34,9 +36,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>BaseLib</Keyword>
-    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -61,11 +60,13 @@
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
   </PackageDependencies>
   <Protocols>
     <Protocol Usage="BY_START">
       <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>
+      <HelpText>gEfiDebugPortVariableGuid, gEfiDebugPortDevicePathGuid are 
+        both the alias of gEfiDebugPortProtocolGuid. They are not separate guid variables,
+        which are not required to be described in the followin Guids section.</HelpText>
     </Protocol>
     <Protocol Usage="BY_START">
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
@@ -73,11 +74,20 @@
     <Protocol Usage="TO_START">
       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>
     </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>gEfiComponentNameProtocolGuid</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Variables>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0044 0x0045 0x0042 0x0055 0x0047 0x0050 0x004F 0x0052 0x0054</VariableName>
-      <GuidC_Name>gDEBUGPORTGuid</GuidC_Name>
+      <GuidC_Name>gEfiDebugPortProtocolGuid</GuidC_Name>
+      <HelpText>L"DEBUGPORT" variable is specified. gEfiDebugPortVariableGuid is
+       one virtual guid, which can't be described in this section. 
+       So gEfiDebugPortProtocolGuid name is instead of it.</HelpText>
     </Variable>
   </Variables>
   <Externs>