diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 0b4bbe9346..af0835385c 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -91,49 +91,48 @@
   TimerLib
 
 [Guids]
-  gEfiEventReadyToBootGuid                      # ALWAYS_CONSUMED
-  gEfiEventMemoryMapChangeGuid                  # ALWAYS_CONSUMED
-  gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED
-  gEfiEventExitBootServicesGuid                 # ALWAYS_CONSUMED
-  gEfiHobMemoryAllocModuleGuid                  # ALWAYS_CONSUMED
-  gEfiFileInfoGuid                              # ALWAYS_CONSUMED
-  gEfiFirmwareFileSystem2Guid                   # ALWAYS_CONSUMED
-  gAprioriGuid                                  # ALWAYS_CONSUMED
-  gEfiDebugImageInfoTableGuid                   # ALWAYS_CONSUMED
-  gEfiHobListGuid                               # ALWAYS_CONSUMED
-  gEfiDxeServicesTableGuid                      # ALWAYS_CONSUMED
-  gEfiMemoryTypeInformationGuid                 # ALWAYS_CONSUMED
+  gEfiEventMemoryMapChangeGuid                  ## CONSUMES ## Event
+  gEfiEventVirtualAddressChangeGuid             ## SOMETIMES_CONSUMES ## Event
+  gEfiEventExitBootServicesGuid                 ## SOMETIMES_CONSUMES ## Event
+  gEfiHobMemoryAllocModuleGuid                  ## CONSUMES ## Hob
+  gEfiFileInfoGuid                              ## CONSUMES ## File
+  gEfiFirmwareFileSystem2Guid                   ## CONSUMES ## GUID
+  gAprioriGuid                                  ## CONSUMES ## GUID
+  gEfiDebugImageInfoTableGuid                   ## CONSUMES ## GUID
+  gEfiHobListGuid                               ## CONSUMES ## GUID
+  gEfiDxeServicesTableGuid                      ## CONSUMES ## GUID	
+  gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID
 
 [Protocols]
-  gEfiStatusCodeRuntimeProtocolGuid             # PROTOCOL SOMETIMES_CONSUMED
-  gEfiCapsuleArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED
-  gEfiDecompressProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiLoadPeImageProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED
-  gEfiSimpleFileSystemProtocolGuid              # PROTOCOL ALWAYS_CONSUMED
-  gEfiLoadFileProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED
-  gEfiResetArchProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
-  gEfiRealTimeClockArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiRuntimeArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED
-  gEfiWatchdogTimerArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiSecurityArchProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED
-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED
-  gEfiBdsArchProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiMonotonicCounterArchProtocolGuid          # PROTOCOL ALWAYS_CONSUMED
-  gEfiMetronomeArchProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED
-  gEfiTimerArchProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
-  gEfiBusSpecificDriverOverrideProtocolGuid     # PROTOCOL ALWAYS_CONSUMED
-  gEfiPlatformDriverOverrideProtocolGuid        # PROTOCOL ALWAYS_CONSUMED
-  gEfiDriverBindingProtocolGuid                 # PROTOCOL SOMETIMES_CONSUMED
-  gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED
-  gEfiFirmwareVolumeDispatchProtocolGuid        # PROTOCOL ALWAYS_PRODUCED
-  gEfiFirmwareVolume2ProtocolGuid               # PROTOCOL ALWAYS_PRODUCED
-  gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED
-  gEfiEbcProtocolGuid                           # PROTOCOL SOMETIMES_CONSUMED
-  gEfiTcgPlatformProtocolGuid
-  gEfiLoadedImageDevicePathProtocolGuid         # PROTOCOL ALWAYS_PRODUCED
+  gEfiStatusCodeRuntimeProtocolGuid             ## SOMETIMES_CONSUMES
+  gEfiCapsuleArchProtocolGuid                   ## CONSUMES
+  gEfiDecompressProtocolGuid                    ## CONSUMES
+  gEfiLoadPeImageProtocolGuid                   ## PRODUCES
+  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES
+  gEfiLoadFileProtocolGuid                      ## CONSUMES
+  gEfiResetArchProtocolGuid                     ## CONSUMES
+  gEfiRealTimeClockArchProtocolGuid             ## CONSUMES
+  gEfiRuntimeArchProtocolGuid                   ## CONSUMES
+  gEfiWatchdogTimerArchProtocolGuid             ## CONSUMES
+  gEfiSecurityArchProtocolGuid                  ## CONSUMES
+  gEfiVariableArchProtocolGuid                  ## CONSUMES
+  gEfiBdsArchProtocolGuid                       ## CONSUMES
+  gEfiVariableWriteArchProtocolGuid             ## CONSUMES
+  gEfiMonotonicCounterArchProtocolGuid          ## CONSUMES
+  gEfiMetronomeArchProtocolGuid                 ## CONSUMES
+  gEfiTimerArchProtocolGuid                     ## CONSUMES
+  gEfiBusSpecificDriverOverrideProtocolGuid     ## CONSUMES
+  gEfiPlatformDriverOverrideProtocolGuid        ## CONSUMES
+  gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiFirmwareVolumeBlockProtocolGuid           ## PRODUCES
+  gEfiFirmwareVolumeDispatchProtocolGuid        ## PRODUCES
+  gEfiFirmwareVolume2ProtocolGuid               ## PRODUCES
+  gEfiCpuArchProtocolGuid                       ## CONSUMES
+  gEfiDevicePathProtocolGuid                    ## CONSUMES
+  gEfiLoadedImageProtocolGuid                   ## PRODUCES
+  gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES
+  gEfiTcgPlatformProtocolGuid			        ## CONSUMES
+  gEfiLoadedImageDevicePathProtocolGuid         ## PRODUCES
 
 [FixedPcd.common]
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreEntry | 0x3041000          # EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_ENTRY_POINT
diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 0b354dc506..d9c5351bf7 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -70,29 +70,29 @@
   
 
 [Guids]
-  gPeiAprioriFileNameGuid
-  gEfiFirmwareFileSystem2Guid
+  gPeiAprioriFileNameGuid  ## SOMETIMES_CONSUMES ## GUID
+  gEfiFirmwareFileSystem2Guid ## SOMETIMES_CONSUME ## FV
 
 [Ppis]
-  gEfiPeiStatusCodePpiGuid                      # PPI SOMETIMES_CONSUMED
-  gEfiPeiResetPpiGuid                           # PPI SOMETIMES_CONSUMED
-  gEfiDxeIplPpiGuid                             # PPI ALWAYS_CONSUMED
-  gEfiPeiMemoryDiscoveredPpiGuid                # PPI ALWAYS_CONSUMED
-  gEfiPeiDecompressPpiGuid                      # PPI ALWAYS_CONSUMED
-  gEfiPeiFirmwareVolumeInfoPpiGuid              # PPI ALWAYS_CONSUMED
-  gEfiPeiLoadFilePpiGuid                        # PPI ALWAYS_CONSUMED
-  gEfiPeiSecurity2PpiGuid                       # PPI ALWAYS_CONSUMED
-  gEfiTemporaryRamSupportPpiGuid                # PPI ALWAYS_CONSUMED
+  gEfiPeiStatusCodePpiGuid                      ## SOMETIMES_CONSUMES
+  gEfiPeiResetPpiGuid                           ## SOMETIMES_CONSUMES
+  gEfiDxeIplPpiGuid                             ## CONSUMES
+  gEfiPeiMemoryDiscoveredPpiGuid                ## CONSUMES
+  gEfiPeiDecompressPpiGuid                      ## CONSUMES
+  gEfiPeiFirmwareVolumeInfoPpiGuid              ## CONSUMES
+  gEfiPeiLoadFilePpiGuid                        ## CONSUMES
+  gEfiPeiSecurity2PpiGuid                       ## CONSUMES
+  gEfiTemporaryRamSupportPpiGuid                ## CONSUMES
 
 [FixedPcd.common]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv         ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported      ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch	## SOMETIMES_CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry       ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize      ## CONSUMES
 
 [FeaturePcd.common]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkFvHobCompatibilitySupport
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkFvHobCompatibilitySupport	   ## CONSUMES
   
\ No newline at end of file