diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index 55ed116dbf..722573055c 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -93,7 +93,7 @@
   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL CONSUMES
   gEfiPciIoProtocolGuid                         # PROTOCOL CONSUMES
   gEfiLoadedImageProtocolGuid                   # PROTOCOL CONSUMES
-  gEfiDevicePathToTextProtocolGuid              # PROTOCOL CONSUMES
+  gEfiDevicePathToTextProtocolGuid              # PROTOCOL SOMETIMES_CONSUMES
   gEfiSimpleNetworkProtocolGuid                 # PROTOCOL CONSUMES
   gEfiDebugPortProtocolGuid                     # PROTOCOL CONSUMES
   gEfiSimpleTextInProtocolGuid                  # PROTOCOL CONSUMES
@@ -103,8 +103,8 @@
   gEfiCpuArchProtocolGuid                       # PROTOCOL CONSUMES
   gEfiDevicePathProtocolGuid                    # PROTOCOL CONSUMES
   gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL CONSUMES
-  gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES ## not gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
-  gEfiUgaDrawProtocolGuid                       # PROTOCOL SOMETIMES_CONSUMES ## gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
+  gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES
+  gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport # PROTOCOL SOMETIMES_CONSUMES
   gEfiConsoleControlProtocolGuid                # PROTOCOL CONSUMES
   gEfiOEMBadgingProtocolGuid                    # PROTOCOL CONSUMES
   gEfiHiiFontProtocolGuid                       # PROTOCOL CONSUMES
@@ -114,4 +114,4 @@
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformBootTimeOutDefault
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName
\ No newline at end of file
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDefaultBootFileName
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index 702de6703c..34c38ad682 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -6,7 +6,7 @@
 #  interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.
 #
 #  Generally, this module take reposiblity to connect all necessary devices for platform boot, 
-#  these boot device path  are hold in PlatformBdsLib library instance produced by platform.
+#  these boot device path are hold in PlatformBdsLib library instance produced by platform.
 #  For legacy boot, BDS will transfer control to legacy BIOS after legacy boot device is select.
 #  For EFI boot, BDS will load boot loader file EFI\BOOT\BOOTIA32.EFI, EFI\BOOT\BOOTX64.EFI, 
 #  EFI\BOOT\BOOTIA64.EFI file from selected boot device and transfer control to boot loader.
@@ -14,7 +14,7 @@
 #  BDSDxe also maintain the UI for "Boot Manager, Boot Maintaince Manager, Device Manager" which
 #  is used for user to configure boot option or maintain hardware device.
 #  
-#  Copyright (c) 2008, Intel Corporation. <BR>
+#  Copyright (c) 2008 - 2009, Intel Corporation. <BR>
 #  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
@@ -135,7 +135,7 @@
   gEfiMiscSubClassGuid                          ## CONSUMES ## GUID (Indicate the datahub for holding misc sub class record)
   gEfiMemorySubClassGuid                        ## CONSUMES ## GUID (Indicate the datahub for holding memory record)
   gEfiProcessorSubClassGuid                     ## CONSUMES ## GUID (Indicate the datahub for holding processor record)
-  gEfiCapsuleVendorGuid                         ## CONSUMES ## GUID (Indicate the hob for holding capsure vendor)
+  gEfiCapsuleVendorGuid                         ## CONSUMES ## GUID (Indicate the hob for holding capsule update image)
 
 [Protocols]
   gEfiHiiStringProtocolGuid                     # PROTOCOL ALWAYS_CONSUMES
@@ -147,9 +147,9 @@
   gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMES
   gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMES
   gEfiHiiDatabaseProtocolGuid                   # PROTOCOL ALWAYS_CONSUMES
-  gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES
+  gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport # PROTOCOL SOMETIMES_CONSUMES
   gEfiBlockIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES
-  gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMES
+  gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES
   gEfiSimpleTextInputExProtocolGuid             # PROTOCOL ALWAYS_CONSUMES
   gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMES
   gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMES
@@ -172,14 +172,14 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
 
 [Depex]
-  gEfiHiiDatabaseProtocolGuid
+  TRUE
 
 #
 # [BootMode] 
-#   BOOT_ON_FLASH_UPDATE            ## SOMETIMES_CONSUMES
+#   BOOT_ON_FLASH_UPDATE    ## SOMETIMES_CONSUMES (Update Capsule Image)
 #
 #  
 # [Hob]
-#   CAPSULE_HOB                     ## SOMETIMES_CONSUMES
+#   HOB                     ## SOMETIMES_CONSUMES  ## GUID EXTENSION Capsule Data Hob
 #
 #