diff --git a/MdeModulePkg/Universal/Variable/Application/VariableInfo.inf b/MdeModulePkg/Universal/Variable/Application/VariableInfo.inf
index b1af5fb37e..233663ce7b 100644
--- a/MdeModulePkg/Universal/Variable/Application/VariableInfo.inf
+++ b/MdeModulePkg/Universal/Variable/Application/VariableInfo.inf
@@ -42,4 +42,4 @@
   UefiLib
 
 [Guids]
-  gEfiVariableInfoGuid
+  gEfiVariableInfoGuid        ## ALWAYS_CONSUMES # Configuration Table Guid
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
index 57092c5868..1344405ce2 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
@@ -51,8 +51,8 @@
 
 
 [Protocols]
-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED
-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED
+  gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES
+  gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES
 
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize
@@ -62,3 +62,10 @@
 [Depex]
   TRUE
 
+# [Event]
+#   ##
+#   # Event will be signaled for VIRTUAL_ADDRESS_CHANGE event.
+#   #
+#   EVENT_TYPE_NOTIFY_SIGNAL                    ## PRODUCES
+#
+#
\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index 58fbb177ff..11f5c8142d 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -54,14 +54,14 @@
   PcdLib
 
 [Protocols]
-  gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL SOMETIMES_CONSUMED
-  gEfiFaultTolerantWriteLiteProtocolGuid        # PROTOCOL SOMETIMES_CONSUMED
-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED
-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED
+  gEfiFirmwareVolumeBlockProtocolGuid           ## SOMETIMES_CONSUMES
+  gEfiFaultTolerantWriteLiteProtocolGuid        ## SOMETIMES_CONSUMES
+  gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES
+  gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES
 
 [Guids]
-  gEfiVariableInfoGuid
-  gEfiGlobalVariableGuid
+  gEfiVariableInfoGuid                          ## PRODUCES ## Configuration Table Guid 
+  gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid
 
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
@@ -76,3 +76,10 @@
 [Depex]
   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiFaultTolerantWriteLiteProtocolGuid
 
+# [Event]
+#   ##
+#   # Event will be signaled for VIRTUAL_ADDRESS_CHANGE event.
+#   #
+#   EVENT_TYPE_NOTIFY_SIGNAL                    ## PRODUCES
+#
+#
\ No newline at end of file