From 6ff7a41cb8b4e16800f70fd72e7290a418d4329e Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 12 Jun 2006 07:57:04 +0000
Subject: [PATCH] Modify PCD tool according to final PCD schema modification.
 1) Change code of PCD tools. 2) Update all FPD file. 3) Fix some bugs in FPD
 for wrong DatumSize.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@481 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkModulePkg/EdkModulePkg-All-Archs.fpd       | 29539 ++++------------
 EdkModulePkg/EdkModulePkg.fpd                 |  8011 +----
 EdkNt32Pkg/Nt32.fpd                           | 11827 ++-----
 MdePkg/MdePkg-All-Archs.fpd                   |  2420 +-
 MdePkg/MdePkg.fpd                             |   890 +-
 .../build/pcd/action/CollectPCDAction.java    |   590 +-
 .../build/pcd/action/PCDAutoGenAction.java    |   105 -
 .../pcd/action/ShowPCDDatabaseAction.java     |     2 +-
 .../build/pcd/entity/DynamicTokenValue.java   |   185 +
 .../pcd/entity/MemoryDatabaseManager.java     |     3 +-
 .../build/pcd/entity/SkuInstance.java         |    11 +-
 .../org/tianocore/build/pcd/entity/Token.java |   208 +-
 .../build/pcd/entity/UsageInstance.java       |   122 +-
 .../build/pcd/ui/PCDDatabaseFrame.java        |     8 -
 14 files changed, 12937 insertions(+), 40984 deletions(-)
 create mode 100644 Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java

diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index dd4b712a0f..f72403046f 100644
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -290,27972 +290,12001 @@
   <FrameworkModules>
     <SEC>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
     </SEC>
     <PEI_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </PEI_CORE>
     <PEIM>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </PEIM>
     <DXE_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </DXE_CORE>
     <DXE_DRIVERS>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdVpdBaseAddress</C_Name>
             <Token>0x00010010</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </DXE_DRIVERS>
     <OTHER_COMPONENTS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeIpl" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="GraphicsConsole" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Runtime" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="MonotonicCounter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Variable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="EmuVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="StatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PcdPeim" >
-        <PcdBuildDeclarations>
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+            <PcdData ItemType="FIXED_AT_BUILD">
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
               <Token>0x0001000f</Token>
               <DatumType>UINT32</DatumType>
-              <HiiEnable>false</HiiEnable>
-              <VpdEnable>false</VpdEnable>
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-              <SkuEnable>false</SkuEnable>
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>
-              <MaxSku>0</MaxSku>
-              <SkuId>0</SkuId>
-              <DatumSize>4</DatumSize>
-              <VariableGuid>0</VariableGuid>
-              <VariableName>L""</VariableName>
-              <DataOffset>0</DataOffset>
-              <DefaultValue>0x08</DefaultValue>
-            </PcdBuildData>           
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+              <MaxDatumSize>4</MaxDatumSize>
+              <Value>0x08</Value>
+            </PcdData>           
+            <PcdData ItemType="FIXED_AT_BUILD">
              <C_Name>PcdVpdBaseAddress</C_Name>
                 <Token>0x00010010</Token>
                 <DatumType>UINT32</DatumType>
-                <HiiEnable>false</HiiEnable>
-                <VpdEnable>false</VpdEnable>
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-                <SkuEnable>false</SkuEnable>
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>
-                <MaxSku>0</MaxSku>
-                <SkuId>0</SkuId>
-                <DatumSize>4</DatumSize>
-                <VariableGuid>0</VariableGuid>
-                <VariableName>L""</VariableName>
-                <DataOffset>0</DataOffset>
-                <DefaultValue>0x10000000</DefaultValue>
-            </PcdBuildData>           
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+                <MaxDatumSize>4</MaxDatumSize>
+                <Value>0x10000000</Value>
+            </PcdData>           
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="WatchDogTimer" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="FtwLite" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Terminal" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHubStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="NullMemoryTest" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HiiDatabase" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ConSplitter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BC" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Dhcp4" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SNP" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Ebc" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SetupBrowser" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DriverSample" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PciBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="AtapiPassThru" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="IdeBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Uhci" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiDisk" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBot" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi0" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi1" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbKb" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMassStorage" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMouse" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       
       <!-- X64 -->
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Partition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="English" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIo" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SecurityStub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeIpl" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="GraphicsConsole" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Runtime" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="MonotonicCounter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Variable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="EmuVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="StatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PcdPeim" >
-        <PcdBuildDeclarations>
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+            <PcdData ItemType="FIXED_AT_BUILD">
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
               <Token>0x0001000f</Token>
               <DatumType>UINT32</DatumType>
-              <HiiEnable>false</HiiEnable>
-              <VpdEnable>false</VpdEnable>
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-              <SkuEnable>false</SkuEnable>
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>
-              <MaxSku>0</MaxSku>
-              <SkuId>0</SkuId>
-              <DatumSize>4</DatumSize>
-              <VariableGuid>0</VariableGuid>
-              <VariableName>L""</VariableName>
-              <DataOffset>0</DataOffset>
-              <DefaultValue>0x08</DefaultValue>
-            </PcdBuildData>           
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+              <MaxDatumSize>4</MaxDatumSize>
+              <Value>0x08</Value>
+            </PcdData>           
+            <PcdData ItemType="FIXED_AT_BUILD">
              <C_Name>PcdVpdBaseAddress</C_Name>
                 <Token>0x00010010</Token>
                 <DatumType>UINT32</DatumType>
-                <HiiEnable>false</HiiEnable>
-                <VpdEnable>false</VpdEnable>
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-                <SkuEnable>false</SkuEnable>
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>
-                <MaxSku>0</MaxSku>
-                <SkuId>0</SkuId>
-                <DatumSize>4</DatumSize>
-                <VariableGuid>0</VariableGuid>
-                <VariableName>L""</VariableName>
-                <DataOffset>0</DataOffset>
-                <DefaultValue>0x10000000</DefaultValue>
-            </PcdBuildData>           
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+                <MaxDatumSize>4</MaxDatumSize>
+                <Value>0x10000000</Value>
+            </PcdData>           
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="WatchDogTimer" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="FtwLite" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DebugPort" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <!--
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DebugSupport" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       -->
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Terminal" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DataHub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DataHubStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="NullMemoryTest" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="HiiDatabase" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ConSplitter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BC" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Dhcp4" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SNP" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Ebc" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="SetupBrowser" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DriverSample" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PciBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="AtapiPassThru" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="IdeBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="Uhci" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ScsiBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="ScsiDisk" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbBot" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbCbi0" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbCbi1" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbKb" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbMassStorage" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UsbMouse" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
 
       <!-- IPF -->
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Partition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="English" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIo" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SecurityStub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeIpl" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="GraphicsConsole" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Runtime" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="MonotonicCounter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Variable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="EmuVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="StatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PcdPeim" >
-        <PcdBuildDeclarations>
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+            <PcdData ItemType="FIXED_AT_BUILD">
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
               <Token>0x0001000f</Token>
               <DatumType>UINT32</DatumType>
-              <HiiEnable>false</HiiEnable>
-              <VpdEnable>false</VpdEnable>
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-              <SkuEnable>false</SkuEnable>
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>
-              <MaxSku>0</MaxSku>
-              <SkuId>0</SkuId>
-              <DatumSize>4</DatumSize>
-              <VariableGuid>0</VariableGuid>
-              <VariableName>L""</VariableName>
-              <DataOffset>0</DataOffset>
-              <DefaultValue>0x08</DefaultValue>
-            </PcdBuildData>           
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+              <MaxDatumSize>4</MaxDatumSize>
+              <Value>0x08</Value>
+            </PcdData>           
+            <PcdData ItemType="FIXED_AT_BUILD">
              <C_Name>PcdVpdBaseAddress</C_Name>
                 <Token>0x00010010</Token>
                 <DatumType>UINT32</DatumType>
-                <HiiEnable>false</HiiEnable>
-                <VpdEnable>false</VpdEnable>
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-                <SkuEnable>false</SkuEnable>
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>
-                <MaxSku>0</MaxSku>
-                <SkuId>0</SkuId>
-                <DatumSize>4</DatumSize>
-                <VariableGuid>0</VariableGuid>
-                <VariableName>L""</VariableName>
-                <DataOffset>0</DataOffset>
-                <DefaultValue>0x10000000</DefaultValue>
-            </PcdBuildData>           
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+                <MaxDatumSize>4</MaxDatumSize>
+                <Value>0x10000000</Value>
+            </PcdData>           
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="WatchDogTimer" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="FtwLite" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DebugPort" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <!--
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DebugSupport" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>   
       -->   
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Terminal" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DataHub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DataHubStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="NullMemoryTest" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="HiiDatabase" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ConSplitter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BC" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Dhcp4" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SNP" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Ebc" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="SetupBrowser" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DriverSample" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PciBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="AtapiPassThru" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="IdeBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="Uhci" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ScsiBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="ScsiDisk" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbBot" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbCbi0" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbCbi1" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbKb" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbMassStorage" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UsbMouse" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
 
       <!-- EBC -->
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Partition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="English" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIo" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SecurityStub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeIpl" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="GraphicsConsole" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <!-- Not Support
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Runtime" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="MonotonicCounter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Variable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="EmuVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="StatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>     
       --> 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PcdPeim" >
-        <PcdBuildDeclarations>
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+            <PcdData ItemType="FIXED_AT_BUILD">
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
               <Token>0x0001000f</Token>
               <DatumType>UINT32</DatumType>
-              <HiiEnable>false</HiiEnable>
-              <VpdEnable>false</VpdEnable>
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-              <SkuEnable>false</SkuEnable>
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>
-              <MaxSku>0</MaxSku>
-              <SkuId>0</SkuId>
-              <DatumSize>4</DatumSize>
-              <VariableGuid>0</VariableGuid>
-              <VariableName>L""</VariableName>
-              <DataOffset>0</DataOffset>
-              <DefaultValue>0x08</DefaultValue>
-            </PcdBuildData>           
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+              <MaxDatumSize>4</MaxDatumSize>
+              <Value>0x08</Value>
+            </PcdData>           
+            <PcdData ItemType="FIXED_AT_BUILD">
              <C_Name>PcdVpdBaseAddress</C_Name>
                 <Token>0x00010010</Token>
                 <DatumType>UINT32</DatumType>
-                <HiiEnable>false</HiiEnable>
-                <VpdEnable>false</VpdEnable>
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-                <SkuEnable>false</SkuEnable>
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>
-                <MaxSku>0</MaxSku>
-                <SkuId>0</SkuId>
-                <DatumSize>4</DatumSize>
-                <VariableGuid>0</VariableGuid>
-                <VariableName>L""</VariableName>
-                <DataOffset>0</DataOffset>
-                <DefaultValue>0x10000000</DefaultValue>
-            </PcdBuildData>           
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+                <MaxDatumSize>4</MaxDatumSize>
+                <Value>0x10000000</Value>
+            </PcdData>           
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="WatchDogTimer" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="FtwLite" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DebugPort" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <!-- 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DebugSupport" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>  
       -->    
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Terminal" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DataHub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DataHubStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="NullMemoryTest" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="HiiDatabase" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ConSplitter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BC" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Dhcp4" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SNP" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <!--
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Ebc" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA> 
       -->     
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="SetupBrowser" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DriverSample" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PciBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="AtapiPassThru" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="IdeBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="Uhci" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ScsiBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="ScsiDisk" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbBot" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbCbi0" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbCbi1" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbKb" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbMassStorage" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UsbMouse" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
     </OTHER_COMPONENTS>
   </FrameworkModules>
diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 02f7e35504..4ab1114752 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -95,7862 +95,3531 @@
   <FrameworkModules>
     <SEC>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
     </SEC>
     <PEI_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </PEI_CORE>
     <PEIM>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </PEIM>
     <DXE_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </DXE_CORE>
     <DXE_DRIVERS>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdVpdBaseAddress</C_Name>
             <Token>0x00010010</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
     </DXE_DRIVERS>
     <OTHER_COMPONENTS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HelloWorld" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Partition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="English" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIo" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DiskIoPartition" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecurityStub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiMain" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeIpl" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="GraphicsConsole" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Runtime" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="MonotonicCounter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Variable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="EmuVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="StatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiBaseMemoryTestInit" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PcdPeim" >
-        <PcdBuildDeclarations>
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+            <PcdData ItemType="FIXED_AT_BUILD">
               <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
               <Token>0x0001000f</Token>
               <DatumType>UINT32</DatumType>
-              <HiiEnable>false</HiiEnable>
-              <VpdEnable>false</VpdEnable>
-              <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-              <SkuEnable>false</SkuEnable>
-              <SkuDataArrayEnable>false</SkuDataArrayEnable>
-              <MaxSku>0</MaxSku>
-              <SkuId>0</SkuId>
-              <DatumSize>4</DatumSize>
-              <VariableGuid>0</VariableGuid>
-              <VariableName>L""</VariableName>
-              <DataOffset>0</DataOffset>
-              <DefaultValue>0x08</DefaultValue>
-            </PcdBuildData>           
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+              <MaxDatumSize>4</MaxDatumSize>
+              <Value>0x08</Value>
+            </PcdData>           
+            <PcdData ItemType="FIXED_AT_BUILD">
              <C_Name>PcdVpdBaseAddress</C_Name>
                 <Token>0x00010010</Token>
                 <DatumType>UINT32</DatumType>
-                <HiiEnable>false</HiiEnable>
-                <VpdEnable>false</VpdEnable>
-                <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-                <SkuEnable>false</SkuEnable>
-                <SkuDataArrayEnable>false</SkuDataArrayEnable>
-                <MaxSku>0</MaxSku>
-                <SkuId>0</SkuId>
-                <DatumSize>4</DatumSize>
-                <VariableGuid>0</VariableGuid>
-                <VariableName>L""</VariableName>
-                <DataOffset>0</DataOffset>
-                <DefaultValue>0x10000000</DefaultValue>
-            </PcdBuildData>           
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+                <MaxDatumSize>4</MaxDatumSize>
+                <Value>0x10000000</Value>
+            </PcdData>           
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiVariable" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="WatchDogTimer" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="FtwLite" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Terminal" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHub" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DataHubStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="NullMemoryTest" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="HiiDatabase" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ConSplitter" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BC" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Dhcp4" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SNP" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Ebc" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SetupBrowser" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DriverSample" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PciBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="AtapiPassThru" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="CirrusLogic5430UgaDraw" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="IdeBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="Uhci" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="ScsiDisk" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBot" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbBus" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi0" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbCbi1" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbKb" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMassStorage" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UsbMouse" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>      
     </OTHER_COMPONENTS>
   </FrameworkModules>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index b8a9f1b19e..e041ef53d5 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -228,230 +228,99 @@
   <FrameworkModules>
     <SEC>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="SecMain">
-        <PcdBuildDeclarations>
-            <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtCpuModel</C_Name>
             <Token>0x00001007</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>48</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>48</MaxDatumSize>
+            <Value>L"Intel(R) Processor Model"</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdWinNtFirmwareVolume</C_Name>
             <Token>0x00001009</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>44</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>44</MaxDatumSize>
+            <Value>L"..\\..\\Fv\\Fv_Recovery.fd"</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdWinNtBootMode</C_Name>
             <Token>0x00001006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtMemorySize</C_Name>
             <Token>0x00001005</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>10</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"64!64"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>10</MaxDatumSize>
+            <Value>L"64!64"</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
             <Token>0x00001005</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>10</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>L"64!64"</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>10</MaxDatumSize>
+            <Value>L"64!64"</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
     </SEC>
     <PEI_CORE>
@@ -466,1689 +335,729 @@
             <Library OverrideID="6666">EdkNt32PeiPeCoffGetEntryPointLib</Library>
           </Arch>
         </Libraries>
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
     </PEI_CORE>
     <PEIM>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdPeim">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="DYNAMIC">
+            <C_Name>PcdKentTestDynamicUINT32</C_Name>
+            <Token>0x0001000e</Token>
+            <DatumType>UINT32</DatumType>
+            <MaxDatumSize>4</MaxDatumSize>
+          </PcdData>        
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
             <Token>0x0001000f</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x8</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            
+            <Value>0x8</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdVpdBaseAddress</C_Name>
             <Token>0x00010010</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x0</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            
+            <Value>0x0</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdTestDynamicUint8</C_Name>
             <Token>0x00011000</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x1</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdTestDynamicUint16</C_Name>
             <Token>0x00011001</Token>
             <DatumType>UINT16</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>2</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x1234</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>2</MaxDatumSize>
+            <Value>0x1234</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdTestDynamicUint32</C_Name>
             <Token>0x00011002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>NoDefault</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdTestDynamicUint64</C_Name>
             <Token>0x00011003</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>8</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>NoDefault</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdTestDynamicBoolean</C_Name>
             <Token>0x00011004</Token>
             <DatumType>BOOLEAN</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>NoDefault</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>      
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>      
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BootMode">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiFlashMap">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiBaseMemoryTestInit">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeiVariable">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtAutoScan">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtFwh">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtStuff">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeIpl">
         <Libraries>
@@ -2156,9283 +1065,4031 @@
             <Library OverrideID="8888">Nt32PeCoffLoaderLib</Library>
           </Arch>
         </Libraries>
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
     </PEIM>
     <DXE_CORE>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DxeMain">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            
+            <Value>0</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
     </DXE_CORE>
     <DXE_DRIVERS>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PcdDxe">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
             <Token>0x0001000f</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x8</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            
+            <Value>0x8</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdVpdBaseAddress</C_Name>
             <Token>0x00010010</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x0</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            
+            <Value>0x0</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Crc32SectionExtract">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Cpu">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Metronome">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Timer">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="RealTimeClock">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Reset">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Bds">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            
+            <Value>0</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WatchDogTimer">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Runtime">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonotonicCounter">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="StatusCode">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FwBlockService">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="FtwLite">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Variable">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SecurityStub">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugPort">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DebugSupport">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConPlatform">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ConSplitter">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="GraphicsConsole">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Terminal">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHub">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DataHubStdErr">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIo">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DiskIoPartition">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Ebc">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="NullMemoryTest">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HiiDatabase">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Partition">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Logo">
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PciBus">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SetupBrowser">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="DriverSample">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="English">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="AtapiPassThru">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="CirrusLogic5430UgaDraw">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="IdeBus">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            
+            <Value>0</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Uhci">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiBus">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="ScsiDisk">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBot">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbBus">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi0">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbCbi1">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbKb">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMassStorage">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="UsbMouse">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="BC">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Dhcp4">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="SNP">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtThunk">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBusDriver">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtMemorySize</C_Name>
             <Token>0x00001005</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>10</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"64!64"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>10</MaxDatumSize>
+            <Value>L"64!64"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtPhysicalDisk</C_Name>
             <Token>0x00001000</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>24</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"FW;40960;512"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>24</MaxDatumSize>
+            <Value>L"FW;40960;512"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtVirtualDisk</C_Name>
             <Token>0x00001001</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>24</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"FW;40960;512"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>24</MaxDatumSize>
+            <Value>L"FW;40960;512"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtSerialPort</C_Name>
             <Token>0x00001002</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>20</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>L"COM1!COM2"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>18</MaxDatumSize>
+            <Value>L"COM1!COM2"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtUga</C_Name>
             <Token>0x00001003</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>50</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>50</MaxDatumSize>
+            <Value>L"UGA Window 1!UGA Window 2"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtCpuModel</C_Name>
             <Token>0x00001007</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>48</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>48</MaxDatumSize>
+            <Value>L"Intel(R) Processor Model"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtFileSystem</C_Name>
             <Token>0x00001004</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>120</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>120</MaxDatumSize>
+            <Value>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtConsole</C_Name>
             <Token>0x0000100a</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>50</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>L"Bus Driver Console Window"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>50</MaxDatumSize>
+            <Value>L"Bus Driver Console Window"</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtCpuSpeed</C_Name>
             <Token>0x00001008</Token>
             <DatumType>VOID*</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>8</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>L"3000"</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FEATURE_FLAG">
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>L"3000"</Value>
+          </PcdData>
+          <PcdData ItemType="FEATURE_FLAG">
             <C_Name>PcdWinNtFeatureFlag1</C_Name>
             <Token>0x0001000d</Token>
             <DatumType>BOOLEAN</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x1</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdWinNtBinaryPatch1</C_Name>
             <Token>0x0001000b</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x1234</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x1234</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdWinNtBinaryPatch2</C_Name>
             <Token>0x0001000c</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x5678</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="DYNAMIC">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x5678</Value>
+          </PcdData>
+          <PcdData ItemType="DYNAMIC">
             <C_Name>PcdWinNtDynamicUINT32</C_Name>
             <Token>0x0001000e</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0x0</DefaultValue>
-          </PcdBuildData>
-          
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtBlockIo">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtConsole">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSerialIo">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtSimpleFileSystem">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="WinNtUga">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MiscSubclass">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Shell">
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="Fat">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="HelloWorld">
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x1f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x1f</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
     </DXE_DRIVERS>
   </FrameworkModules>
-  <PcdDynamicBuildDeclarations>
+  <DynamicPcdBuildDefinitions>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtMemorySize</C_Name>
       <Token>0x00001005</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>10</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>L"64!64"</DefaultValue>
+      <MaxDatumSize>10</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"64!64"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuModel</C_Name>
       <Token>0x00001007</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>48</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>
+      <MaxDatumSize>48</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"Intel(R) Processor Model"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtPhysicalDisk</C_Name>
       <Token>0x00001000</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>24</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>L"FW;40960;512"</DefaultValue>
+      <MaxDatumSize>24</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"FW;40960;512"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtVirtualDisk</C_Name>
       <Token>0x00001001</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>24</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>L"FW;40960;512"</DefaultValue>
+      <MaxDatumSize>24</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"FW;40960;512"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtFileSystem</C_Name>
       <Token>0x00001004</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>120</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>
+      <MaxDatumSize>120</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtSerialPort</C_Name>
       <Token>0x00001002</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>20</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>L"COM1!COM2"</DefaultValue>
+      <MaxDatumSize>20</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"COM1!COM2"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtConsole</C_Name>
       <Token>0x0000100a</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>50</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <DefaultValue>L"Bus Driver Console Window"</DefaultValue>
+      <MaxDatumSize>50</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"Bus Driver Console Window"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtUga</C_Name>
       <Token>0x00001003</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>50</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>
+      <MaxDatumSize>50</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"UGA Window 1!UGA Window 2"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint8</C_Name>
       <Token>0x00011000</Token>
       <DatumType>UINT8</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>1</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0x1</DefaultValue>
+      <MaxDatumSize>1</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>0x1</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint16</C_Name>
       <Token>0x00011001</Token>
       <DatumType>UINT16</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>2</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0x1234</DefaultValue>
+      <MaxDatumSize>2</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
 
+        <Value>0x1234</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint32</C_Name>
       <Token>0x00011002</Token>
       <DatumType>UINT32</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>NoDefault</DefaultValue>
+      <MaxDatumSize>4</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>0</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint64</C_Name>
       <Token>0x00011003</Token>
       <DatumType>UINT64</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>8</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>NoDefault</DefaultValue>
+      <MaxDatumSize>8</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>0</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdTestDynamicBoolean</C_Name>
       <Token>0x00011004</Token>
       <DatumType>BOOLEAN</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>1</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>NoDefault</DefaultValue>
+      <MaxDatumSize>1</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>0</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtCpuSpeed</C_Name>
       <Token>0x00001008</Token>
       <DatumType>VOID*</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>8</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>L"3000"</DefaultValue>
+      <MaxDatumSize>8</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>L"3000"</Value>
+      </SkuInfo>
     </PcdBuildData>
     <PcdBuildData ItemType="DYNAMIC">
       <C_Name>PcdWinNtDynamicUINT32</C_Name>
       <Token>0x0001000e</Token>
       <DatumType>UINT32</DatumType>
-      <HiiEnable>false</HiiEnable>
-      <VpdEnable>false</VpdEnable>
-      <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-      <SkuEnable>false</SkuEnable>
-      <SkuDataArrayEnable>false</SkuDataArrayEnable>
-      <MaxSku>0x00</MaxSku>
-      <SkuId>0x00</SkuId>
-      <DatumSize>4</DatumSize>
-      <VariableGuid>0</VariableGuid>
-      <VariableName>L""</VariableName>
-      <DataOffset>0</DataOffset>
-      <GuidOffset>0</GuidOffset>
-      <DefaultValue>0x0</DefaultValue>
+      <MaxDatumSize>4</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <Value>0x0</Value>
+      </SkuInfo>
+    </PcdBuildData>
+    <PcdBuildData ItemType="DYNAMIC">
+      <C_Name>PcdKentTestDynamicUINT32</C_Name>
+      <Token>0x0001000e</Token>
+      <DatumType>UINT32</DatumType>
+      <MaxDatumSize>4</MaxDatumSize>
+      <SkuInfo>
+        <SkuId>0</SkuId>
+        <VariableName>0x0062 0x006F 0x006F 0x0074 0x006D 0x006F 0x0064 0x0065</VariableName>
+        <VariableGuid>0</VariableGuid>
+        <VariableOffset>0x123</VariableOffset>
+        <HiiDefaultValue>0x123</HiiDefaultValue>
+        </SkuInfo>
     </PcdBuildData>
-  </PcdDynamicBuildDeclarations>
+  </DynamicPcdBuildDefinitions>
   <BuildOptions>
     <OutputDirectory IntermediateDirectories="UNIFIED"/>
     <Option>CC_FLAGS="/nologo", "/W4", "/WX", "/GX", "/Gy", "/c", "/D EFI_MONOSHELL", "/D UNICODE", "/D EFI_DEBUG", "/D EFI_PEI_REPORT_STATUS_CODE_ON", "/Zi", "/D EFI32", "/DEFI_NT_EMULATOR", "/DNEW_PEI_HOBS", "/Odiyb2", "/GL", "/G7", "/Gy", "/DSTRING_ARRAY_NAME=${BASE_NAME}Strings", "/DSTRING_DEFINES_FILE=\"${BASE_NAME}StrDefs.h\""</Option>
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 636fd0e429..62aee07ae5 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -335,446 +335,206 @@
   <FrameworkModules>
     <SEC>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </SEC>
     <PEI_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </PEI_CORE>
     <PEIM>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </PEIM>
     <DXE_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </DXE_CORE>
     <DXE_DRIVERS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </DXE_DRIVERS>
     <OTHER_COMPONENTS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -799,104 +559,53 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -904,26 +613,15 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -941,80 +639,40 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -1037,109 +695,59 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>                
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
@@ -1153,8 +761,6 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -1164,114 +770,54 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
@@ -1294,76 +840,36 @@
       </ModuleSA>        
       
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -1388,104 +894,53 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -1493,26 +948,15 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -1530,80 +974,40 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -1626,109 +1030,59 @@
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>                
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
@@ -1742,8 +1096,6 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -1753,114 +1105,54 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IPF" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
@@ -1883,76 +1175,36 @@
       </ModuleSA>        
       
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -1977,104 +1229,53 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -2082,26 +1283,15 @@
       </ModuleSA>        
 
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -2119,80 +1309,40 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -2215,109 +1365,59 @@
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>       
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>         
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
@@ -2331,8 +1431,6 @@
       </ModuleSA>        
 
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -2342,114 +1440,54 @@
       </ModuleSA>        
 
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="X64" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
@@ -2472,76 +1510,36 @@
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -2566,104 +1564,53 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -2671,26 +1618,15 @@
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -2708,80 +1644,40 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -2804,109 +1700,59 @@
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
@@ -2920,8 +1766,6 @@
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -2931,114 +1775,54 @@
       </ModuleSA>        
 
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="EBC" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index d3068a5817..be98926e7d 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -113,446 +113,206 @@
   <FrameworkModules>
     <SEC>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </SEC>
     <PEI_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </PEI_CORE>
     <PEIM>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </PEIM>
     <DXE_CORE>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </DXE_CORE>
     <DXE_DRIVERS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
     </DXE_DRIVERS>
     <OTHER_COMPONENTS>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumUnicodeStringLength</C_Name>
             <Token>0x00000001</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumAsciiStringLength</C_Name>
             <Token>0x00000002</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdSpinLockTimeout</C_Name>
             <Token>0x00000004</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>10000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>10000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdMaximumLinkedListLength</C_Name>
             <Token>0x00000003</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>1000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>1000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseMemoryLib" >
       </ModuleSA>        
@@ -577,104 +337,53 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePrintLib" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePerformanceLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
             <Token>0x00000009</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>      
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePcdLibNull" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibPciExpress" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciLibCf8" >
       </ModuleSA>        
@@ -682,26 +391,15 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePciExpressLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPciExpressBaseAddress</C_Name>
             <Token>0x0000000A</Token>
             <DatumType>UINT64</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <GuidOffset>0</GuidOffset>
-            <DefaultValue>0xE0000000</DefaultValue>
-          </PcdBuildData>        
-        </PcdBuildDeclarations>
+            <MaxDatumSize>8</MaxDatumSize>
+            <Value>0xE0000000</Value>
+          </PcdData>        
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseSmbusLib" >
       </ModuleSA>        
@@ -719,80 +417,40 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiServicesTablePointerLibMm7" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseDebugLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiCoreEntryPoint" >
       </ModuleSA>        
@@ -815,109 +473,59 @@
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="PeiIoLibCpuIo" >
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxeReportStatusCodeLib" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BaseReportStatusCodeLibNull" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x07</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLib80" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibReportStatusCode" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="BasePostCodeLibDebug" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdPostCodePropertyMask</C_Name>
             <Token>0x0000000b</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x00</DefaultValue>
-          </PcdBuildData>
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x00</Value>
+          </PcdData>
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
       </ModuleSA>        
@@ -931,8 +539,6 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverEntryPoint" >
-        <PcdBuildDeclarations>
-        </PcdBuildDeclarations>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDriverModelLib" >
       </ModuleSA>        
@@ -942,114 +548,54 @@
       </ModuleSA>        
 
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibStdErr" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>   
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>   
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="UefiDebugLibConOut" >
-        <PcdBuildDeclarations>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+        <PcdBuildDefinition>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugPropertyMask</C_Name>
             <Token>0x00000005</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x0f</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="PATCHABLE_IN_MODULE">
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0x0f</Value>
+          </PcdData>
+          <PcdData ItemType="PATCHABLE_IN_MODULE">
             <C_Name>PcdDebugPrintErrorLevel</C_Name>
             <Token>0x00000006</Token>
             <DatumType>UINT32</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0x00</MaxSku>
-            <SkuId>0x00</SkuId>
-            <DatumSize>4</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdDebugClearMemoryValue</C_Name>
             <Token>0x00000008</Token>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0xAF</DefaultValue>
-          </PcdBuildData>           
-        </PcdBuildDeclarations>
+            <MaxDatumSize>1</MaxDatumSize>
+            <Value>0xAF</Value>
+          </PcdData>           
+        </PcdBuildDefinition>
       </ModuleSA>        
       <ModuleSA Arch="IA32" FvBinding="NULL" ModuleName="DxePcdLib" >
       </ModuleSA>        
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
index 4001558ef6..4057c417e4 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 package org.tianocore.build.pcd.action;
 
-import java.io.BufferedReader;
+import java.io.BufferedReader;                                                    
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -31,20 +31,21 @@ import java.util.UUID;
 
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.tianocore.DynamicPcdBuildDefinitionsDocument;
+import org.tianocore.DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions;
+import org.tianocore.DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData.SkuInfo;
+import org.tianocore.DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData;
 import org.tianocore.FrameworkModulesDocument;
 import org.tianocore.FrameworkPlatformDescriptionDocument;
 import org.tianocore.FrameworkPlatformDescriptionDocument.FrameworkPlatformDescription;
 import org.tianocore.ModuleSADocument;
 import org.tianocore.ModuleSADocument.ModuleSA;
 import org.tianocore.PackageSurfaceAreaDocument;
-import org.tianocore.PcdBuildDeclarationsDocument.PcdBuildDeclarations.PcdBuildData;
-import org.tianocore.PcdBuildDeclarationsDocument.PcdBuildDeclarations.PcdBuildData.SkuData;
-import org.tianocore.PcdDefinitionsDocument.PcdDefinitions;
-import org.tianocore.PcdDynamicBuildDeclarationsDocument.PcdDynamicBuildDeclarations;
-import org.tianocore.build.autogen.CommonDefinition;
+import org.tianocore.PcdBuildDefinitionDocument.PcdBuildDefinition;
 import org.tianocore.build.global.GlobalData;
 import org.tianocore.build.global.SurfaceAreaQuery;
 import org.tianocore.build.pcd.action.ActionMessage;
+import org.tianocore.build.pcd.entity.DynamicTokenValue;
 import org.tianocore.build.pcd.entity.MemoryDatabaseManager;
 import org.tianocore.build.pcd.entity.SkuInstance;
 import org.tianocore.build.pcd.entity.Token;
@@ -421,8 +422,8 @@ class SkuIdTable {
 
         int index;
 
-        Integer [] skuIds = new Integer[token.maxSkuCount + 1];
-        skuIds[0] = new Integer(token.maxSkuCount);
+        Integer [] skuIds = new Integer[token.skuData.size() + 1];
+        skuIds[0] = new Integer(token.skuData.size());
         for (index = 1; index < skuIds.length; index++) {
             skuIds[index] = new Integer(token.skuData.get(index - 1).id);
         }
@@ -516,15 +517,15 @@ class LocalTokenNumberTable {
             str += " | PCD_TYPE_STRING";
         }
 
-        if (token.skuEnabled) {
+        if (token.isSkuEnable()) {
             str += " | PCD_TYPE_SKU_ENABLED";
         }
 
-        if (token.hiiEnabled) {
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.HII_TYPE) {
             str += " | PCD_TYPE_HII";
         }
 
-        if (token.vpdEnabled) {
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.VPD_TYPE) {
             str += " | PCD_TYPE_VPD";
         }
         
@@ -723,11 +724,11 @@ class PcdDatabase {
     }
 
     private int getAlignmentSize (Token token) {
-        if (token.hiiEnabled) {
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.HII_TYPE) {
             return 2;
         }
 
-        if (token.vpdEnabled) {
+        if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.VPD_TYPE) {
             return 4;
         }
 
@@ -760,7 +761,8 @@ class PcdDatabase {
         return hString;
     }
 
-     public void genCode () {
+     public void genCode () 
+        throws EntityException {
 
         final String newLine                        = "\r\n";
         final String declNewLine                    = ";\r\n";
@@ -924,7 +926,8 @@ class PcdDatabase {
         return str;
     }
 
-    private HashMap<String, ArrayList<String>> processTokens (List<Token> alToken) {
+    private HashMap<String, ArrayList<String>> processTokens (List<Token> alToken) 
+        throws EntityException {
 
         HashMap <String, ArrayList<String>> map = new HashMap<String, ArrayList<String>>();
 
@@ -936,7 +939,7 @@ class PcdDatabase {
         for (int index = 0; index < alToken.size(); index++) {
             Token token = alToken.get(index);
 
-            if (token.skuEnabled) {
+            if (token.isSkuEnable()) {
                 //
                 // BugBug: Schema only support Data type now
                 //
@@ -955,10 +958,10 @@ class PcdDatabase {
                 }
 
             } else {
-                if (token.hiiEnabled) {
+                if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.HII_TYPE) {
                     decl.add(getVariableEnableTypeDeclaration(token));
                     inst.add(getVariableEnableInstantiation(token));
-                } else if (token.vpdEnabled) {
+                } else if (token.getDefaultSku().type == DynamicTokenValue.VALUE_TYPE.VPD_TYPE) {
                     decl.add(getVpdEnableTypeDeclaration(token));
                     inst.add(getVpdEnableTypeInstantiation(token));
                 } else if (token.isStringType()) {
@@ -1011,10 +1014,10 @@ class PcdDatabase {
         } else if (token.datumType == Token.DATUM_TYPE.BOOLEAN) {
             typeStr = "BOOLEAN %s_%s[%d];\r\n";
         } else if (token.datumType == Token.DATUM_TYPE.POINTER) {
-            return String.format("UINT8 %s_s[%d];\r\n", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.maxSkuCount);
+            return String.format("UINT8 %s_%s[%d];\r\n", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.skuData.size());
         } 
 
-        return String.format(typeStr, token.getPrimaryKeyString(), "SkuDataTable", token.maxSkuCount);
+        return String.format(typeStr, token.getPrimaryKeyString(), "SkuDataTable", token.skuData.size());
 
     }
 
@@ -1022,12 +1025,12 @@ class PcdDatabase {
         String str = "";
 
         if (token.datumType == Token.DATUM_TYPE.POINTER) {
-            return String.format("UINT8 %s_s[%d]", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.maxSkuCount);
+            return String.format("UINT8 %s_%s[%d]", token.getPrimaryKeyString(), "SkuDataTable", token.datumSize * token.skuData.size());
         } else {
             str = "{ ";
-            for (int idx = 0; idx < token.maxSkuCount; idx++) {
+            for (int idx = 0; idx < token.skuData.size(); idx++) {
                 str += token.skuData.get(idx).toString();
-                if (idx != token.maxSkuCount - 1) {
+                if (idx != token.skuData.size() - 1) {
                     str += ", ";
                 }
             }
@@ -1041,9 +1044,9 @@ class PcdDatabase {
     private String getDataTypeInstantiation (Token token) {
 
         if (token.datumType == Token.DATUM_TYPE.POINTER) {
-            return String.format("%s /* %s */", token.datum.toString(), token.getPrimaryKeyString());
+            return String.format("%s /* %s */", token.getDefaultSku().value, token.getPrimaryKeyString());
         } else {
-            return String.format("%s /* %s */", token.datum.toString(), token.getPrimaryKeyString());
+            return String.format("%s /* %s */", token.getDefaultSku().value, token.getPrimaryKeyString());
         }
     }
 
@@ -1075,7 +1078,7 @@ class PcdDatabase {
     }
 
     private String getVpdEnableTypeInstantiation (Token token) {
-        return String.format("{ %d } /* %s */", token.vpdOffset,
+        return String.format("{ %s } /* %s */", token.getDefaultSku().vpdOffset,
                                                 token.getPrimaryKeyString());
     }
 
@@ -1093,10 +1096,14 @@ class PcdDatabase {
       return String.format("VARIABLE_HEAD  %s", token.getPrimaryKeyString());
     }
 
-    private String getVariableEnableInstantiation (Token token) {
-        return String.format("{ %d, %d, %d } /* %s */", guidTable.add(token.variableGuid, token.getPrimaryKeyString()),
-                                                        stringTable.add(token.variableName, token),
-                                                        token.variableOffset, 
+    private String getVariableEnableInstantiation (Token token) 
+        throws EntityException {
+        //
+        // Need scott fix
+        // 
+        return String.format("{ %d, %d, %s } /* %s */", guidTable.add(token.getDefaultSku().variableGuid, token.getPrimaryKeyString()),
+                                                        stringTable.add(token.getDefaultSku().getStringOfVariableName(), token),
+                                                        token.getDefaultSku().variableOffset, 
                                                         token.getPrimaryKeyString());
     }
 
@@ -1287,7 +1294,6 @@ public class CollectPCDAction {
         // memory database.
         //
         createTokenInDBFromFPD();
-
         
         //
         // Call Private function genPcdDatabaseSourceCode (void); ComponentTypeBsDriver
@@ -1436,25 +1442,29 @@ public class CollectPCDAction {
         int                                 index             = 0;
         int                                 index2            = 0;
         int                                 pcdIndex          = 0;
-        List<PcdBuildData>                  pcdBuildDataArray = new ArrayList<PcdBuildData>();
-        PcdBuildData                        pcdBuildData      = null;
+        List<PcdBuildDefinition.PcdData>    pcdBuildDataArray = new ArrayList<PcdBuildDefinition.PcdData>();
+        PcdBuildDefinition.PcdData          pcdBuildData      = null;
         Token                               token             = null;
-        UUID                                nullUUID          = new UUID(0,0);
-        UUID                                platformTokenSpace= nullUUID;
         SkuInstance                         skuInstance       = null;
         int                                 skuIndex          = 0;
         List<ModuleInfo>                    modules           = null;
         String                              primaryKey        = null;
-        PcdBuildData.SkuData[]              skuDataArray      = null;
         String                              exceptionString   = null;
         UsageInstance                       usageInstance     = null;
         String                              primaryKey1       = null;
         String                              primaryKey2       = null;
         boolean                             isDuplicate       = false;
-        java.util.List<java.lang.String>    tokenGuidStringArray = null;
+        Token.PCD_TYPE                      pcdType           = Token.PCD_TYPE.UNKNOWN;
+        Token.DATUM_TYPE                    datumType         = Token.DATUM_TYPE.UNKNOWN;
+        int                                 tokenNumber       = 0;
+        String                              moduleName        = null;
+        String                              datum             = null;
+        int                                 maxDatumSize      = 0;
 
         //
-        // Get all <ModuleSA> from FPD file.
+        // ----------------------------------------------
+        // 1), Get all <ModuleSA> from FPD file.
+        // ----------------------------------------------
         // 
         modules = getComponentsFromFPD();
 
@@ -1463,7 +1473,9 @@ public class CollectPCDAction {
         }
 
         //
-        // Loop all modules to process <PcdBuildDeclarations> for each module.
+        // -------------------------------------------------------------------
+        // 2), Loop all modules to process <PcdBuildDeclarations> for each module.
+        // -------------------------------------------------------------------
         // 
         for (index = 0; index < modules.size(); index ++) {
             isDuplicate =  false;
@@ -1494,52 +1506,122 @@ public class CollectPCDAction {
                 continue;
             }
 
-            if (modules.get(index).module.getPcdBuildDeclarations() == null) {
-                continue;
-            }
-            pcdBuildDataArray = modules.get(index).module.getPcdBuildDeclarations().getPcdBuildDataList();
-            if (pcdBuildDataArray == null) {
+    	    //
+    	    // It is legal for a module does not contains ANY pcd build definitions.
+    	    // 
+    	    if (modules.get(index).module.getPcdBuildDefinition() == null) {
                 continue;
-            }
-            if (pcdBuildDataArray.size() == 0) {
-                continue;
-            }
+    	    }
+    
+            pcdBuildDataArray = modules.get(index).module.getPcdBuildDefinition().getPcdDataList();
+
+            moduleName = modules.get(index).module.getModuleName();
 
             //
-            // Loop all Pcd entry for a module and add it into memory database.
+            // ----------------------------------------------------------------------
+            // 2.1), Loop all Pcd entry for a module and add it into memory database.
+            // ----------------------------------------------------------------------
             // 
             for (pcdIndex = 0; pcdIndex < pcdBuildDataArray.size(); pcdIndex ++) {
                 pcdBuildData = pcdBuildDataArray.get(pcdIndex);
                 primaryKey   = Token.getPrimaryKeyString(pcdBuildData.getCName(),
                                                          translateSchemaStringToUUID(pcdBuildData.getTokenSpaceGuid()));
+                pcdType      = Token.getpcdTypeFromString(pcdBuildData.getItemType().toString());
+                datumType    = Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString());
+                tokenNumber  = Integer.decode(pcdBuildData.getToken().toString());
+                datum        = pcdBuildData.getValue();
+                maxDatumSize = pcdBuildData.getMaxDatumSize();
 
+                //
+                // -------------------------------------------------------------------------------------------
+                // 2.1.1), Do some necessary checking work for FixedAtBuild, FeatureFlag and PatchableInModule
+                // -------------------------------------------------------------------------------------------
+                // 
+                if (!Token.isDynamic(pcdType)) {
+                     //
+                     // Value is required.
+                     // 
+                     if (datum == null) {
+                         exceptionString = String.format("There is no value for PCD entry %s in module %s!",
+                                                         pcdBuildData.getCName(),
+                                                         moduleName);
+                         throw new EntityException(exceptionString);
+                     }
+
+                     //
+                     // Check whether the datum size is matched datum type.
+                     // 
+                     if ((exceptionString = verifyDatumSize(pcdBuildData.getCName(), 
+                                                            moduleName,
+                                                            maxDatumSize, 
+                                                            datumType)) != null) {
+                         throw new EntityException(exceptionString);
+                     }
+                }
 
+                //
+                // ---------------------------------------------------------------------------------
+                // 2.1.2), Create token or update token information for current anaylized PCD data.
+                // ---------------------------------------------------------------------------------
+                // 
                 if (dbManager.isTokenInDatabase(primaryKey)) {
                     //
                     // If the token is already exist in database, do some necessary checking
                     // and add a usage instance into this token in database
                     // 
                     token = dbManager.getTokenByKey(primaryKey);
+    
+                    //
+                    // checking for DatumType, DatumType should be unique for one PCD used in different
+                    // modules.
+                    // 
+                    if (token.datumType != datumType) {
+                        exceptionString = String.format("The datum type of PCD entry %s is %s, which is different with  %s defined in before!",
+                                                        pcdBuildData.getCName(), 
+                                                        pcdBuildData.getDatumType().toString(), 
+                                                        Token.getStringOfdatumType(token.datumType));
+                        throw new EntityException(exceptionString);
+                    }
 
                     //
-                    // Checking for DatumSize
+                    // Check token number is valid
                     // 
-                    if (token.datumSize != pcdBuildData.getDatumSize()) {
-                        exceptionString = String.format("The datum size of PCD entry %s is %d, which is different with %d defined in before!",
-                                                        pcdBuildData.getCName(),  pcdBuildData.getDatumSize(), token.datumSize);
+                    if (tokenNumber != token.tokenNumber) {
+                        exceptionString = String.format("The token number of PCD entry %s in module %s is different with same PCD entry in other modules!",
+                                                        pcdBuildData.getCName(),
+                                                        moduleName);
                         throw new EntityException(exceptionString);
                     }
 
                     //
-                    // checking for DatumType
+                    // For same PCD used in different modules, the PCD type should all be dynamic or non-dynamic.
                     // 
-                    if (token.datumType != Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString())) {
-                        exceptionString = String.format("The datum type of PCD entry %s is %s, which is different with  %s defined in before!",
-                                                        pcdBuildData.getCName(), 
-                                                        pcdBuildData.getDatumType().toString(), 
-                                                        Token.getStringOfdatumType(token.datumType));
+                    if (token.isDynamicPCD != Token.isDynamic(pcdType)) {
+                        exceptionString = String.format("For PCD entry %s in module %s, you define dynamic or non-dynamic PCD type which"+
+                                                        "is different with others module's",
+                                                        token.cName,
+                                                        moduleName);
                         throw new EntityException(exceptionString);
                     }
+
+                    if (token.isDynamicPCD) {
+                        //
+                        // Check datum is equal the datum in dynamic information.
+                        // For dynamic PCD, you can do not write <Value> in sperated every <PcdBuildDefinition> in different <ModuleSA>,
+                        // But if you write, the <Value> must be same as the value in <DynamicPcdBuildDefinitions>.
+                        // 
+                        if (!token.isSkuEnable() && 
+                            (token.skuData.get(0).value.type == DynamicTokenValue.VALUE_TYPE.DEFAULT_TYPE)) {
+                            if (!datum.equalsIgnoreCase(token.skuData.get(0).value.value)) {
+                                exceptionString = String.format("For dynamic PCD %s in module %s, the datum in <ModuleSA> is "+
+                                                                "not equal to the datum in <DynamicPcdBuildDefinitions>, it is "+
+                                                                "illega! You can choose no <Value> in <ModuleSA>!",
+                                                                token.cName,
+                                                                moduleName);
+                            }
+                        }
+                    }
+                    
                 } else {
                     //
                     // If the token is not in database, create a new token instance and add
@@ -1547,71 +1629,73 @@ public class CollectPCDAction {
                     // 
                     token = new Token(pcdBuildData.getCName(), 
                                       translateSchemaStringToUUID(pcdBuildData.getTokenSpaceGuid()));
-
-                    token.datum         = pcdBuildData.getDefaultValue();
-                    token.pcdType       = Token.getpcdTypeFromString(pcdBuildData.getItemType().toString());
-                    token.datumType     = Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString());
-                    token.datumSize     = pcdBuildData.getDatumSize();
-                    token.skuId         = Integer.decode(pcdBuildData.getSkuId());
-
-                    if (pcdBuildData.getToken() == null) {
-                        exceptionString = String.format("In FPD file, No <TokenNumber> defined for PCD entry %s in module %s",
-                                                        token.cName,
-                                                        modules.get(index).module.getModuleName());
-                        throw new EntityException(exceptionString);
-                    }
-                    token.tokenNumber = Integer.decode(pcdBuildData.getToken().getStringValue());
-
-                    if ((token.pcdType == Token.PCD_TYPE.DYNAMIC) ||
-                        (token.pcdType == Token.PCD_TYPE.DYNAMIC_EX)) {
-                        updateDynamicInformation(modules.get(index).module.getModuleName(),  token);
+    
+                    token.datumType     = datumType;
+                    token.tokenNumber   = tokenNumber;
+                    token.isDynamicPCD  = Token.isDynamic(pcdType);
+                    token.datumSize     = maxDatumSize;
+                    
+                    if (token.isDynamicPCD) {
+                        //
+                        // For Dynamic and Dynamic Ex type, need find the dynamic information
+                        // in <DynamicPcdBuildDefinition> section in FPD file.
+                        // 
+                        updateDynamicInformation(moduleName, 
+                                                 token,
+                                                 datum,
+                                                 maxDatumSize);
                     }
-
+    
                     dbManager.addTokenToDatabase(primaryKey, token);
                 }
 
                 //
-                // Create an usage instance for this token
+                // -----------------------------------------------------------------------------------
+                // 2.1.3), Add the PcdType in current module into this Pcd token's supported PCD type.
+                // -----------------------------------------------------------------------------------
+                // 
+                token.updateSupportPcdType(pcdType);
+
+                //
+                // ------------------------------------------------
+                // 2.1.4), Create an usage instance for this token.
+                // ------------------------------------------------
                 // 
                 usageInstance = new UsageInstance(token, 
-                                                  Token.getpcdTypeFromString(pcdBuildData.getItemType().toString()),
-                                                  modules.get(index).module.getModuleName(), 
+                                                  moduleName, 
                                                   translateSchemaStringToUUID(modules.get(index).module.getModuleGuid()),
                                                   modules.get(index).module.getPackageName(),
                                                   translateSchemaStringToUUID(modules.get(index).module.getPackageGuid()),
                                                   modules.get(index).type, 
-                                                  Token.getpcdTypeFromString(pcdBuildData.getItemType().toString()),
+                                                  pcdType,
                                                   modules.get(index).module.getArch().toString(), 
                                                   null,
-                                                  pcdBuildData.getDefaultValue());
+                                                  datum,
+                                                  maxDatumSize);
                 token.addUsageInstance(usageInstance);
             }
         }
     }
 
     /**
-       Update dynamic information for PCD entry.
+       Get dynamic information for a dynamic PCD from <DynamicPcdBuildDefinition> seciton in FPD file.
        
-       Dynamic information is retrieved from <PcdDynamicBuildDeclarations> in
-       FPD file.
+       This function should be implemented in GlobalData in future.
        
-       @param moduleName
-       @param token
+       @param token         The token instance which has hold module's PCD information
+       @param moduleName    The name of module who will use this Dynamic PCD.
        
-       @return Token
-    **/
-    private Token updateDynamicInformation(String moduleName, Token token) 
+       @return DynamicPcdBuildDefinitions.PcdBuildData
+     */
+    /***/
+    private DynamicPcdBuildDefinitions.PcdBuildData getDynamicInfoFromFPD(Token     token,
+                                                                          String    moduleName)
         throws EntityException {
-        PcdDynamicBuildDeclarations                pcdDynamicBuildDescriptions = null;
-        
-        boolean                                    isFound                     = false;            
-        int                                        index                       = 0;
-        String                                     primaryKey                  = null;
-        SkuInstance                                skuInstance                 = null;
-        int                                        skuIndex                    = 0;
-        String                                     exceptionString             = null;
-        PcdDynamicBuildDeclarations.PcdBuildData.SkuData[] skuDataArray             = null;
-        List<PcdDynamicBuildDeclarations.PcdBuildData>     pcdDynamicBuildDataArray = null;
+        int    index             = 0;
+        String exceptionString   = null;
+        String dynamicPrimaryKey = null;
+        DynamicPcdBuildDefinitions                    dynamicPcdBuildDefinitions = null;
+        List<DynamicPcdBuildDefinitions.PcdBuildData> dynamicPcdBuildDataArray   = null;
 
         //
         // If FPD document is not be opened, open and initialize it.
@@ -1626,109 +1710,238 @@ public class CollectPCDAction {
             }
         }
 
-        pcdDynamicBuildDescriptions = fpdDocInstance.getFrameworkPlatformDescription().getPcdDynamicBuildDeclarations();
-        if (pcdDynamicBuildDescriptions == null) {
-            throw new EntityException(String.format("There are no <PcdDynamicBuildDescriptions> in FPD file but contains Dynamic type "+
-                                                    "PCD entry %s in module %s!",
-                                                    token.cName,
-                                                    moduleName));
+        dynamicPcdBuildDefinitions = fpdDocInstance.getFrameworkPlatformDescription().getDynamicPcdBuildDefinitions();
+        if (dynamicPcdBuildDefinitions == null) {
+            exceptionString = String.format("There are no <PcdDynamicBuildDescriptions> in FPD file but contains Dynamic type "+
+                                            "PCD entry %s in module %s!",
+                                            token.cName,
+                                            moduleName);
+            throw new EntityException(exceptionString);
         }
 
-        pcdDynamicBuildDataArray    = pcdDynamicBuildDescriptions.getPcdBuildDataList();
-        if (pcdDynamicBuildDataArray == null) {
-            throw new EntityException(String.format("There are no PcdDynamicBuildData in <PcdDynamicBuildDeclaration> section but contains Dynamic type"+
-                                                    "PCD entry %s in module %s.!",
-                                                    token.cName,
-                                                    moduleName));
+        dynamicPcdBuildDataArray = dynamicPcdBuildDefinitions.getPcdBuildDataList();
+        for (index = 0; index < dynamicPcdBuildDataArray.size(); index ++) {
+            dynamicPrimaryKey = Token.getPrimaryKeyString(dynamicPcdBuildDataArray.get(index).getCName(),
+                                                          translateSchemaStringToUUID(dynamicPcdBuildDataArray.get(index).getTokenSpaceGuid()));
+            if (dynamicPrimaryKey.equalsIgnoreCase(token.getPrimaryKeyString())) {
+                return dynamicPcdBuildDataArray.get(index);
+            }
         }
 
-        isFound = false;
-        for (index = 0; index < pcdDynamicBuildDataArray.size(); index ++) {
-            if (pcdDynamicBuildDataArray.get(index).getTokenSpaceGuidList().size() != 0) {
-                primaryKey = Token.getPrimaryKeyString(pcdDynamicBuildDataArray.get(index).getCName(), 
-                                                       translateSchemaStringToUUID(pcdDynamicBuildDataArray.get(index).getTokenSpaceGuidList().get(0)));
-            } else {
-                primaryKey = Token.getPrimaryKeyString(pcdDynamicBuildDataArray.get(index).getCName(), 
-                                                       translateSchemaStringToUUID(null));
+        return null;
+    }
+
+    /**
+       Verify the maxDatumSize for a PCD data is matched to Datum type.
+       
+       @param token             The token instance
+       @param moduleName        The module name who use this PCD data.
+       @param maxDatumSize      The value of max datum size in FPD file
+       @param datumType         The datum type
+       
+       @return String           if is unmatched, set the exception information
+                                as return value, otherwice is null.
+    **/
+    private String verifyDatumSize(String           cName, 
+                                   String           moduleName,
+                                   int              maxDatumSize, 
+                                   Token.DATUM_TYPE datumType) {
+        String exceptionString = null;
+        switch (datumType) {
+        case UINT8:
+            if (maxDatumSize != 1) {
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+
+                                                "is UINT8, but datum size is %d, they are not matched!",
+                                                cName,
+                                                moduleName,
+                                                maxDatumSize);
+            }
+            break;
+        case UINT16:
+            if (maxDatumSize != 2) {
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+
+                                                "is UINT16, but datum size is %d, they are not matched!",
+                                                cName,
+                                                moduleName,
+                                                maxDatumSize);
+            }
+            break;
+        case UINT32:
+            if (maxDatumSize != 4) {
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+
+                                                "is UINT32, but datum size is %d, they are not matched!",
+                                                cName,
+                                                moduleName,
+                                                maxDatumSize);
             }
+            break;
+        case UINT64:
+            if (maxDatumSize != 8) {
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+
+                                                "is UINT64, but datum size is %d, they are not matched!",
+                                                cName,
+                                                moduleName,
+                                                maxDatumSize);
+            }
+            break;
+        case BOOLEAN:
+            if (maxDatumSize != 1) {
+                exceptionString = String.format("In FPD file, the datum type of PCD data %s in module %s "+
+                                                "is BOOLEAN, but datum size is %d, they are not matched!",
+                                                cName,
+                                                moduleName,
+                                                maxDatumSize);
+            }
+            break;
+        }
 
-            if (primaryKey.equalsIgnoreCase(token.getPrimaryKeyString())) {
-                isFound = true;
+        return exceptionString;
+    }
 
-                //
-                // For Hii related value
-                // 
-                token.hiiEnabled    = pcdDynamicBuildDataArray.get(index).getHiiEnable();
-                if (token.hiiEnabled) {
-                    token.variableGuid      = Token.getGUIDFromSchemaObject(pcdDynamicBuildDataArray.get(index).getVariableGuid());
-                    if (token.variableGuid == null) {
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, HiiEnable is true" +
-                                                                "but no <VariableGuid> is found! Please fix the FPD file!",
-                                                                token.cName));
+    /**
+       Update dynamic information for PCD entry.
+       
+       Dynamic information is retrieved from <PcdDynamicBuildDeclarations> in
+       FPD file.
+       
+       @param moduleName        The name of the module who use this PCD
+       @param token             The token instance
+       @param datum             The <datum> in module's PCD information
+       @param maxDatumSize      The <maxDatumSize> in module's PCD information
+       
+       @return Token
+     */
+    private Token updateDynamicInformation(String   moduleName, 
+                                           Token    token,
+                                           String   datum,
+                                           int      maxDatumSize) 
+        throws EntityException {
+        int                 index           = 0;
+        int                 offset;
+        String              exceptionString = null;
+        DynamicTokenValue   dynamicValue;
+        SkuInstance         skuInstance     = null;
+        String              temp;
+        boolean             hasSkuId0       = false;
+
+        List<DynamicPcdBuildDefinitions.PcdBuildData.SkuInfo>   skuInfoList = null;
+        DynamicPcdBuildDefinitions.PcdBuildData                 dynamicInfo = null;
+
+        dynamicInfo = getDynamicInfoFromFPD(token, moduleName);
+        if (dynamicInfo == null) {
+            exceptionString = String.format("For Dynamic PCD %s used by module %s, "+
+                                            "there is no dynamic information in <DynamicPcdBuildDefinitions> "+
+                                            "in FPD file, but it is required!",
+                                            token.cName,
+                                            moduleName);
+            throw new EntityException(exceptionString);
+        }
 
-                    }
-                    token.variableName      = pcdDynamicBuildDataArray.get(index).getVariableName();
-                    if (token.variableName == null) {
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, HiiEnable is true" +
-                                                                "but no <VariableName> is found! Please fix the FPD file!",
-                                                                token.cName));
-                    }
+        skuInfoList = dynamicInfo.getSkuInfoList();
 
-                    if (pcdDynamicBuildDataArray.get(index).getDataOffset() == null) {
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, HiiEnable is true" +
-                                                                "but no <DataOffset> is found! Please fix the FPD file!",
-                                                                token.cName));
-                    }
-                    token.variableOffset    = Integer.decode(pcdDynamicBuildDataArray.get(index).getDataOffset());
-                }
+        //
+        // Loop all sku data 
+        // 
+        for (index = 0; index < skuInfoList.size(); index ++) {
+            skuInstance = new SkuInstance();
+            //
+            // Although SkuId in schema is BigInteger, but in fact, sku id is 32 bit value.
+            // 
+            temp = skuInfoList.get(index).getSkuId().toString();
+            skuInstance.id = Integer.decode(temp);
 
-                //
-                // For Vpd related value
-                // 
-                token.vpdEnabled    = pcdDynamicBuildDataArray.get(index).getVpdEnable();
-                if (token.vpdEnabled) {
-                    if (pcdDynamicBuildDataArray.get(index).getDataOffset() == null) {
-                        throw new EntityException(String.format("In <PcdDynamicBuildDeclarations> for PCD entry %s, VpdEnable is true" +
-                                                                "but no <DataOffset> is found! Please fix the FPD file!",
-                                                                token.cName));
-                    }
-                    token.vpdOffset         = Integer.decode(pcdDynamicBuildDataArray.get(index).getDataOffset());
-                }
+            if (skuInstance.id == 0) {
+                hasSkuId0 = true;
+            }
+            //
+            // Judge whether is DefaultGroup at first, because most case is DefautlGroup.
+            // 
+            if (skuInfoList.get(index).getValue() != null) {
+                skuInstance.value.setValue(skuInfoList.get(index).getValue());
+                token.skuData.add(skuInstance);
 
                 //
-                // For SkuData
+                // Judege wether is same of datum between module's information
+                // and dynamic information.
                 // 
-                token.skuEnabled    = pcdDynamicBuildDataArray.get(index).getSkuEnable();
-                if (token.skuEnabled) {
-                    skuDataArray      = (PcdDynamicBuildDeclarations.PcdBuildData.SkuData[])pcdDynamicBuildDataArray.get(index).getSkuDataList().toArray();
-                    token.maxSkuCount = Integer.decode(pcdDynamicBuildDataArray.get(index).getMaxSku());
-                    if (skuDataArray == null) {
-                        exceptionString = String.format("In FPD file, the <SkuEnable> is true for PCD entry %s in module %s, But no any sku data.",
-                                                        token.cName, moduleName);
-                        throw new EntityException(exceptionString);
-                    }
-                    if (token.maxSkuCount != pcdDynamicBuildDataArray.get(index).sizeOfSkuDataArray()) {
-                        exceptionString = String.format("In FPD file, <MaxSku> is not equal to the size of <SkuDataArray> for PCD entry %s in module %s",
-                                                        token.cName, moduleName);
+                if (datum != null) {
+                    if ((skuInstance.id == 0)                                   &&
+                        !datum.equalsIgnoreCase(skuInfoList.get(index).getValue())) {
+                        exceptionString = String.format("For dynamic PCD %s, module %s give <datum> as %s which is different with "+
+                                                        "Sku 0's <datum> %s defined in <DynamicPcdBuildDefinitions>! Please sync them at first!",
+                                                        token.cName,
+                                                        datum,
+                                                        skuInfoList.get(index).getValue());
                         throw new EntityException(exceptionString);
                     }
+                }
+                continue;
+            }
 
-                    for (skuIndex = 0; skuIndex < pcdDynamicBuildDataArray.get(index).sizeOfSkuDataArray(); skuIndex ++) {
-                        skuInstance = new SkuInstance(skuDataArray[skuIndex].getId(),
-                                                      skuDataArray[skuIndex].getValue());
-                        token.skuData.add(skuInstance);
-                    }
+            //
+            // Judge whether is HII group case.
+            // 
+            if (skuInfoList.get(index).getVariableName() != null) {
+                exceptionString = null;
+                if (skuInfoList.get(index).getVariableGuid() == null) {
+                    exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+
+                                                    "file, who use HII, but there is no <VariableGuid> defined for Sku %d data!",
+                                                    token.cName,
+                                                    index);
+                                                    
+                }
+
+                if (skuInfoList.get(index).getVariableOffset() == null) {
+                    exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+
+                                                    "file, who use HII, but there is no <VariableOffset> defined for Sku %d data!",
+                                                    token.cName,
+                                                    index);
+                }
+
+                if (skuInfoList.get(index).getHiiDefaultValue() == null) {
+                    exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions> section in FPD "+
+                                                    "file, who use HII, but there is no <HiiDefaultValue> defined for Sku %d data!",
+                                                    token.cName,
+                                                    index);
                 }
-                break;
+
+                if (exceptionString != null) {
+                    throw new EntityException(exceptionString);
+                }
+                offset = Integer.decode(skuInfoList.get(index).getVariableOffset());
+                if (offset > 0xFFFF) {
+                    throw new EntityException(String.format("For dynamic PCD %s ,  the variable offset defined in sku %d data "+
+                                                            "exceed 64K, it is not allowed!",
+                                                            token.cName,
+                                                            index));
+                }
+
+                skuInstance.value.setHiiData(skuInfoList.get(index).getVariableName(),
+                                             translateSchemaStringToUUID(skuInfoList.get(index).getVariableGuid().toString()),
+                                             skuInfoList.get(index).getVariableOffset(),
+                                             skuInfoList.get(index).getHiiDefaultValue());
+                token.skuData.add(skuInstance);
+                continue;
             }
-        }
-        if (!isFound) {
-            exceptionString = String.format("In FPD file, No dynamic PCD data for PCD entry %s in module %s",
-                                            token.cName,
-                                            moduleName);
+
+            if (skuInfoList.get(index).getVpdOffset() != null) {
+                skuInstance.value.setVpdData(skuInfoList.get(index).getVpdOffset());
+                token.skuData.add(skuInstance);
+                continue;
+            }
+
+            exceptionString = String.format("For dynamic PCD %s, the dynamic info must "+
+                                            "be one of 'DefaultGroup', 'HIIGroup', 'VpdGroup'.",
+                                            token.cName);
             throw new EntityException(exceptionString);
         }
 
+        if (!hasSkuId0) {
+            exceptionString = String.format("For dynamic PCD %s in <DynamicPcdBuildDefinitions>, there are "+
+                                            "no sku id = 0 data, which is required for every dynamic PCD",
+                                            token.cName);
+        }
+
         return token;
     }
 
@@ -1764,6 +1977,11 @@ public class CollectPCDAction {
             return null;
         }
 
+        if (uuidString.equals("0") ||
+            uuidString.equalsIgnoreCase("0x0")) {
+            return new UUID(0, 0);
+        }
+
         //
         // If the UUID schema string is GuidArrayType type then need translate 
         // to GuidNamingConvention type at first.
@@ -1848,11 +2066,11 @@ public class CollectPCDAction {
     **/
     public static void main(String argv[]) throws EntityException {
         CollectPCDAction ca = new CollectPCDAction();
-        ca.setWorkspacePath("M:/ForPcd/edk2");
-        ca.setFPDFilePath("M:/ForPcd/edk2/EdkNt32Pkg/Nt32.fpd");
+        ca.setWorkspacePath("m:/tianocore/edk2");
+        ca.setFPDFilePath("m:/tianocore/edk2/EdkNt32Pkg/Nt32.fpd");
         ca.setActionMessageLevel(ActionMessage.MAX_MESSAGE_LEVEL);
         GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",
-                            "M:/ForPcd/edk2");
+                            "m:/tianocore/edk2");
         ca.execute();
     }
 }
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
index 04e585be3b..278e58ceae 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
@@ -292,111 +292,6 @@ public class PCDAutoGenAction extends BuildAction {
                             );
     }
 
-    /**
-      Generate unreference token definition string for PCD emulated string. 
-      
-      Maybe some PCD token definition in FPD but not used by any module or library, we 
-      should also generate token definition in autoge.h/autogen.c, because maybe some
-      driver loaded in shell will use this PCD. 
-
-     @param token   The token who want be generated autogen string.
-    
-    **/
-    private void generateUnReferencePcdAutogenString(Token token) {
-        hAutoGenString += String.format("#define _PCD_TOKEN_%s   0x%016x\r\n", 
-                                        token.cName, token.tokenNumber);
-        switch (token.pcdType) {
-        case FEATURE_FLAG:
-            hAutoGenString += String.format(
-                                "#define _PCD_VALUE_%s   %s\r\n", 
-                                token.cName, 
-                                token.datum.toString()
-                                );
-            hAutoGenString += String.format(
-                                "extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", 
-                                token.cName
-                                );
-            cAutoGenString += String.format(
-                                "GLOBAL_REMOVE_IF_UNREFERENCED const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
-                                token.cName,
-                                token.cName
-                                );
-            hAutoGenString += String.format(
-                                "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
-                                Token.GetAutogenDefinedatumTypeString(token.datumType),
-                                token.cName,
-                                token.cName
-                                );
-            break;
-        case FIXED_AT_BUILD:
-            hAutoGenString += String.format(
-                                "#define _PCD_VALUE_%s   %s\r\n", 
-                                token.cName, 
-                                token.datum.toString()
-                                );
-            hAutoGenString += String.format(
-                                "extern const %s _gPcd_FixedAtBuild_%s;\r\n",
-                                Token.getAutogendatumTypeString(token.datumType),
-                                token.cName
-                                );
-            cAutoGenString += String.format(
-                                "GLOBAL_REMOVE_IF_UNREFERENCED const %s _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
-                                Token.getAutogendatumTypeString(token.datumType),
-                                token.cName,
-                                token.cName
-                                );
-            hAutoGenString += String.format(
-                                "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
-                                Token.GetAutogenDefinedatumTypeString(token.datumType),
-                                token.cName,
-                                token.cName
-                                );
-            break;
-        case PATCHABLE_IN_MODULE:
-            hAutoGenString += String.format(
-                                 "#define _PCD_VALUE_%s   %s\r\n", 
-                                 token.cName, 
-                                 token.datum.toString()
-                                 );
-            hAutoGenString += String.format(
-                                 "extern %s _gPcd_BinaryPatch_%s;\r\n",
-                                 Token.getAutogendatumTypeString(token.datumType),
-                                 token.cName
-                                 );
-            cAutoGenString += String.format(
-                                 "GLOBAL_REMOVE_IF_UNREFERENCED %s _gPcd_BinaryPatch_%s = _PCD_VALUE_%s;\r\n",
-                                 Token.getAutogendatumTypeString(token.datumType),
-                                 token.cName,
-                                 token.cName
-                                 );
-            hAutoGenString += String.format(
-                                 "#define _PCD_MODE_%s_%s  _gPcd_BinaryPatch_%s\r\n",
-                                 Token.GetAutogenDefinedatumTypeString(token.datumType),
-                                 token.cName,
-                                 token.cName
-                                 );
-            break;
-        case DYNAMIC:
-            hAutoGenString += String.format(
-                                "#define _PCD_MODE_%s_%s  LibPcdGet%s(_PCD_TOKEN_%s)\r\n",
-                                Token.GetAutogenDefinedatumTypeString(token.datumType),
-                                token.cName,
-                                Token.getAutogenLibrarydatumTypeString(token.datumType),
-                                token.cName
-                                );
-            break;
-        case DYNAMIC_EX:
-            break;
-        default:
-            ActionMessage.warning(this, 
-                                  "The PCD_TYPE setted by platform is unknown"
-                                  );
-        }
-
-        hAutoGenString += "\r\n";
-        cAutoGenString += "\r\n";
-    }
-        
     /**
       Test case function
 
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java
index 8af812347f..77e5020397 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java
@@ -124,7 +124,7 @@ public class ShowPCDDatabaseAction extends UIAction {
         ShowPCDDatabaseAction showAction = new ShowPCDDatabaseAction();
         //showAction.setWorkspacePath(argv[0]);
         //showAction.setFPDFilePath(argv[1]);
-        showAction.setWorkspacePath("M:/tianocore/edk2/trunk/edk2");
+        showAction.setWorkspacePath("e:/tianocore/edk2");
         showAction.setFPDFilePath("EdkNt32Pkg/Nt32.fpd");
         showAction.execute();
     }
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java
new file mode 100644
index 0000000000..54c8957302
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/DynamicTokenValue.java
@@ -0,0 +1,185 @@
+/** @file
+  DynamicTokenValue class.
+
+  This module contains the value type of a dynamic token.
+ 
+Copyright (c) 2006, Intel Corporation
+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
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/  
+package org.tianocore.build.pcd.entity;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.tianocore.build.pcd.exception.EntityException;
+
+/** This class is to descript a value type of dynamic PCD.
+    For a dynamic or dynamicEx type PCD data, the value type can be:
+        1) Hii type: the value of dynamic or dynamicEx is stored into a variable.
+        2) Vpd type: the value of dynamic or dynamicEx is stored into somewhere set
+                     by OEM.
+        3) Default type: the value of dynamic or dynamicEx is stored into PCD dynamic
+                         database.
+**/
+public class DynamicTokenValue {
+    ///
+    /// Enumeration macro defintion for value type.
+    /// BUGBUG: Not use upcase charater is to facility for reading. It may be changed
+    ///         in coding review.
+    public enum        VALUE_TYPE {HII_TYPE, VPD_TYPE, DEFAULT_TYPE}
+
+    public VALUE_TYPE  type;
+
+    ///
+    /// ---------------------------------------------------------------------
+    /// Following member is for HII case.
+    /// ---------------------------------------------------------------------
+    ///
+
+    ///
+    /// variableName is valid only when this token support Hii functionality. variableName
+    /// indicates the value of token is associated with what variable.
+    /// variableName is defined in FPD.
+    public List        variableName;
+
+    ///
+    /// variableGuid is the GUID this token associated with.
+    ///
+    public UUID        variableGuid;
+
+    ///
+    /// Variable offset indicate the associated variable's offset in NV storage.
+    ///
+    public String      variableOffset;
+
+    ///
+    /// The default value for HII case.
+    /// 
+    public String      hiiDefaultValue;
+
+    ///
+    /// Following member is for VPD case.
+    /// BUGBUG: Consider 64 bit integer by using java.math.BigInteger.
+    /// 
+    public String      vpdOffset;
+
+    ///
+    /// Following member is for default case.
+    /// 
+    public String      value;
+
+    public DynamicTokenValue() {
+        this.type               = VALUE_TYPE.DEFAULT_TYPE;
+        this.variableName       = null;
+        this.variableGuid       = null;
+        this.variableOffset     = null;
+        this.hiiDefaultValue    = null;
+
+        this.vpdOffset          = null;
+
+        this.value              = null;
+    }
+
+    /**
+       Set the HII case data.
+       
+       @param variableName
+       @param variableGuid
+       @param variableOffset
+       @param hiiDefaultValue
+     */
+    public void setHiiData(List        variableName,
+                           UUID        variableGuid,
+                           String      variableOffset,
+                           String      hiiDefaultValue) {
+        this.type = VALUE_TYPE.HII_TYPE;
+
+        this.variableName    = variableName;
+        this.variableGuid    = variableGuid;
+        this.variableOffset  = variableOffset;
+        this.hiiDefaultValue = hiiDefaultValue;
+    }
+
+    /**
+       Get the string like L"xxx" for a variable Name.
+       
+       BUGBUG: In fact, it is not correctly, variable name should be
+               treated as unicode UINT16 array.
+       
+       @return String
+     */
+    public String getStringOfVariableName() 
+        throws EntityException {
+        String str;
+        int    index, num;
+        char   ch;
+
+        str = "";
+        for (index = 0; index < variableName.size(); index ++) {
+            num = Integer.decode(variableName.get(index).toString());
+            if ((num > 127 ) || (num < 0)) {
+                throw new EntityException(String.format("variable name contains >0x80 character, now is not support!"));
+            }
+            str += (char)num;
+        }
+
+        return str;
+    }
+
+    /**
+       Get UINT16 array which use string to express a number.
+       
+       @return String
+     */
+    public String getStringArrayOfVariableName() {
+        String  strArray;
+        int     index;
+
+        strArray =  "{";
+        for (index = 0; index < variableName.size(); index ++) {
+            strArray += variableName.get(index).toString();
+            if (index != (variableName.size() - 1)) {
+                strArray += ",";
+            }
+        }
+        strArray += "}";
+        return strArray;
+    }
+
+    /**
+       Set Vpd case data.
+       
+       @param vpdOffset
+     */
+    public void setVpdData(String vpdOffset) {
+        this.type = VALUE_TYPE.VPD_TYPE;
+
+        this.vpdOffset = vpdOffset;
+    }
+
+    /**
+       Set default case data.
+       
+       @param value
+     */
+    public void setValue(String value) {
+        this.type = VALUE_TYPE.DEFAULT_TYPE;
+
+        this.value = value;
+    }
+}
+
+
+
+
+
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
index b03cddeed4..0ff5b8e338 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
@@ -145,8 +145,7 @@ public class MemoryDatabaseManager {
         ArrayList<Token>   al   =   new ArrayList<Token>();
 
         for (index = 0; index < tokenArray.length; index++) {
-            if (tokenArray[index].pcdType == Token.PCD_TYPE.DYNAMIC ||
-                tokenArray[index].pcdType == Token.PCD_TYPE.DYNAMIC_EX) {
+            if (tokenArray[index].isDynamicPCD) {
                 al.add(tokenArray[index]);
             }
         }
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java
index 2886506411..6df155157c 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java
@@ -21,11 +21,11 @@ public class SkuInstance {
     ///
     /// The id number of this SKU instance
     ///
-    public int    id;
+    public int              id;
     ///
     /// The value of this SKU instance
     ///
-    public Object value;
+    public DynamicTokenValue value;
 
     /**
       Constructure function
@@ -33,8 +33,13 @@ public class SkuInstance {
       @param id     sku id 
       @param value  sku value for this id.
     **/
-    public SkuInstance(int id, Object value) {
+    public SkuInstance(int id, DynamicTokenValue value) {
         this.id    = id;
         this.value = value;
     }
+
+    public SkuInstance() {
+        this.id    = 0;
+        this.value = new DynamicTokenValue();
+    }
 }
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java
index 3136864872..62e2be5cc9 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java
@@ -70,9 +70,16 @@ public class Token {
     public int              tokenNumber;
 
     ///
-    /// pcdType is the PCD item type defined by platform developer.
+    /// All supported PCD type, this value can be retrieved from SPD
+    /// Currently, only record all PCD type for this token in FPD file.
+    /// 
+    public List<PCD_TYPE>   supportedPcdType;
+
     ///
-    public PCD_TYPE         pcdType;
+    /// If the token's item type is Dynamic or DynamicEx type, isDynamicPCD
+    /// is true.
+    /// 
+    public boolean          isDynamicPCD;
 
     ///
     /// datumSize is to descript the fix size or max size for this token. 
@@ -82,77 +89,17 @@ public class Token {
 
     ///
     /// datum type is to descript what type can be expressed by a PCD token.
-    /// datumType is defined in SPD.
+    /// For same PCD used in different module, the datum type should be unique.
+    /// So it belong memeber to Token class.
     ///
     public DATUM_TYPE       datumType;
 
-    ///
-    /// hiiEnabled is to indicate whether the token support Hii functionality.
-    /// hiiEnabled is defined in FPD.
-    ///
-    public boolean          hiiEnabled;
-
-    ///
-    /// variableName is valid only when this token support Hii functionality. variableName
-    /// indicates the value of token is associated with what variable.
-    /// variableName is defined in FPD.
-    ///
-    public String           variableName;
-
-    ///
-    /// variableGuid is the GUID this token associated with.
-    /// variableGuid is defined in FPD.
-    ///
-    public UUID             variableGuid;
-
-    ///
-    /// Variable offset indicate the associated variable's offset in NV storage.
-    /// variableOffset is defined in FPD.
-    ///
-    public int              variableOffset;
-
-    ///
-    /// skuEnabled is to indicate whether the token support Sku functionality.
-    /// skuEnabled is defined in FPD.
-    ///
-    public boolean          skuEnabled;
-
     ///
     /// skuData contains all value for SkuNumber of token.
-    /// skuData is defined in FPD.
+    /// This field is for Dynamic or DynamicEx type PCD, 
     ///
     public List<SkuInstance> skuData;
 
-    ///
-    /// maxSkuCount indicate the max count of sku data.
-    /// maxSkuCount is defined in FPD.
-    ///
-    public int              maxSkuCount;
-
-    ///
-    /// SkuId is the id of current selected SKU.
-    /// SkuId is defined in FPD.
-    ///
-    public int              skuId;
-
-    ///
-    /// datum is the value set by platform developer.
-    /// datum is defined in FPD.
-    ///
-    public Object           datum;
-
-    ///
-    /// BUGBUG: fix comment
-    /// vpdEnabled is defined in FPD.
-    ///
-    public boolean          vpdEnabled;
-
-    ///
-    /// BUGBUG: fix comment
-    /// vpdOffset is defined in FPD.
-    ///
-    public long             vpdOffset;
-
     ///
     /// consumers array record all module private information who consume this PCD token.
     ///
@@ -164,22 +111,51 @@ public class Token {
         this.cName                  = cName;
         this.tokenSpaceName         = (tokenSpaceName == null) ? nullUUID : tokenSpaceName;
         this.tokenNumber            = 0;
-        this.pcdType                = PCD_TYPE.UNKNOWN;
         this.datumType              = DATUM_TYPE.UNKNOWN;
         this.datumSize              = -1;
-        this.datum                  = null;
-        this.hiiEnabled             = false;
-        this.variableGuid           = null;
-        this.variableName           = "";
-        this.variableOffset         = -1;
-        this.skuEnabled             = false;
-        this.skuId                  = -1;
-        this.maxSkuCount            = -1;
         this.skuData                = new ArrayList<SkuInstance>();
-        this.vpdEnabled             = false;
-        this.vpdOffset              = -1;
 
         this.consumers              = new HashMap<String, UsageInstance>();
+        this.supportedPcdType       = new ArrayList<PCD_TYPE>();
+    }
+
+    /**
+      updateSupportPcdType
+      
+      SupportPcdType should be gotten from SPD file actually, but now it just
+      record all PCD type for this token in FPD file.
+      
+      @param pcdType    new PCD type found in FPD file for this token.
+    **/
+    public void updateSupportPcdType(PCD_TYPE pcdType) {
+        int     index = 0;
+        boolean found = false;
+        for (index = 0; index < this.supportedPcdType.size(); index ++) {
+            if (this.supportedPcdType.get(index) == pcdType) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            this.supportedPcdType.add(pcdType);
+        }
+    }
+
+    /**
+       Judge whether pcdType is belong to dynamic type. Dynamic type includes
+       DYNAMIC and DYNAMIC_EX.
+       
+       @param pcdType
+       
+       @return boolean
+     */
+    public static boolean isDynamic(PCD_TYPE pcdType) {
+        if ((pcdType == PCD_TYPE.DYNAMIC   ) ||
+            (pcdType == PCD_TYPE.DYNAMIC_EX)) {
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -201,6 +177,18 @@ public class Token {
         }
     }
 
+    /**
+       If skudata list contains more than one data, then Sku mechanism is enable.
+       
+       @return boolean
+     */
+    public boolean isSkuEnable() {
+        if (this.skuData.size() > 1) {
+            return true;
+        }
+        return false;
+    }
+
     /**
        Get the token primary key in token database.
        
@@ -540,29 +528,69 @@ public class Token {
         return uuid;
     }
 
+    public DynamicTokenValue getDefaultSku() {
+        DynamicTokenValue dynamicData;
+        int               index;
+        for (index = 0; index < this.skuData.size(); index ++) {
+            if (skuData.get(index).id == 0) {
+                return skuData.get(index).value;
+            }
+        }
+
+        return null;
+    }
     //
     // BugBug: We need change this algorithm accordingly when schema is updated
     //          to support no default value.
     //
     public boolean hasDefaultValue () {
-
-        if (hiiEnabled) {
-            return true;
+        int               value         = 0;
+        boolean           isInteger     = true;
+        DynamicTokenValue dynamicValue  = null;
+
+        if (this.isDynamicPCD) {
+            dynamicValue = getDefaultSku();
+            switch (dynamicValue.type) {
+            case HII_TYPE:
+                try {
+                    value = Integer.decode(dynamicValue.hiiDefaultValue);
+                } catch (NumberFormatException nfEx) {
+                    isInteger = false;
+                }
+                
+                if (isInteger && (value == 0)) {
+                    return false;
+                } else {
+                    return true;
+                }
+
+            case VPD_TYPE:
+                return false;
+
+            case DEFAULT_TYPE:
+                try{
+                    value = Integer.decode(dynamicValue.value);
+                } catch (NumberFormatException nfEx) {
+                    isInteger = false;
+                }
+
+                if (isInteger && (value == 0)) {
+                    return false;
+                } else {
+                    return true;
+                }
+
+            }
         }
 
-        if (vpdEnabled) {
-            return true;
-        }
-
-        if (datum.toString().compareTo("NoDefault") == 0) {
-            return false;
-        }
-
-        return true;
+        return false;
     }
 
+    //
+    // TODO: Need scott's confirmation
+    // 
     public boolean isStringType () {
-        String str = datum.toString();
+        String str = getDefaultSku().value;
 
         if (datumType == Token.DATUM_TYPE.POINTER &&
             str.startsWith("L\"") && 
@@ -574,7 +602,7 @@ public class Token {
     }
 
     public String getStringTypeString () {                       
-        return datum.toString().substring(2, datum.toString().length() - 1);
+        return getDefaultSku().value.substring(2, getDefaultSku().value.length() - 1);
     }
 }
 
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
index 90c0f6322f..378f26f4b0 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
@@ -34,60 +34,78 @@ public class UsageInstance {
   /// The module type of usage instance.
   /// 
   public enum MODULE_TYPE {SEC, PEI_CORE, PEIM, DXE_CORE, DXE_DRIVERS, OTHER_COMPONENTS}
+
   ///
   /// This parent that this usage instance belongs to.
   ///
   public Token            parentToken;
+
   ///
   /// The name of the module who contains this PCD.
   ///
   public String           moduleName;
+
   ///
   /// The GUID of the module who contains this PCD. 
   /// 
   public UUID             moduleGUID;
+
   ///
   /// The name of the package whose module contains this PCD.
   ///
   public String           packageName;
+
   ///
   /// The GUID of the package whose module contains this PCD.
   /// 
   public UUID             packageGUID;
+
   ///
   /// The PCD type defined for module 
   /// 
   public Token.PCD_TYPE   modulePcdType;
+
   ///
   /// The arch string of module contains this PCD
   ///
   public String           arch;
+
   ///
   /// The version of module contains this PCD
   /// 
   public String           version;
+
   ///
   /// The module type for this usage instance.
   ///
   public MODULE_TYPE      moduleType;
+
   ///
   /// The value of the PCD in this usage instance. 
   /// 
-  public Object           datum;
+  public String           datum;
+
+  ///
+  /// The maxDatumSize could be different for same PCD in different module
+  /// But this case is allow for FeatureFlag, FixedAtBuild, PatchableInModule
+  /// type.
+  /// 
+  public int              maxDatumSize;
+
   ///
   /// Autogen string for header file.
   ///
   public String           hAutogenStr;
-  /**
-   * Auotgen string for C code file.
-   */
+
+  ///
+  /// Auotgen string for C code file.
+  /// 
   public String           cAutogenStr;
 
   /**
      Constructure function
      
      @param parentToken         Member variable.
-     @param pcdType             Member variable.
      @param moduleName          Member variable.
      @param moduleGUID          Member variable.
      @param packageName         Member variable.
@@ -97,9 +115,9 @@ public class UsageInstance {
      @param arch                Member variable.
      @param version             Member variable.
      @param value               Member variable.
-  **/
+     @param maxDatumSize        Member variable.
+   */
   public UsageInstance (Token             parentToken,
-                        Token.PCD_TYPE    pcdType,
                         String            moduleName,
                         UUID              moduleGUID,
                         String            packageName,
@@ -108,7 +126,8 @@ public class UsageInstance {
                         Token.PCD_TYPE    modulePcdType,
                         String            arch,
                         String            version,
-                        Object            value) {
+                        String            value,
+                        int               maxDatumSize) {
       this.parentToken      = parentToken;
       this.moduleName       = moduleName;
       this.moduleGUID       = moduleGUID;
@@ -119,7 +138,7 @@ public class UsageInstance {
       this.arch             = arch;
       this.version          = version;
       this.datum            = value;
-      this.modulePcdType    = pcdType;
+      this.maxDatumSize     = maxDatumSize;
   }
 
   /**
@@ -266,85 +285,12 @@ public class UsageInstance {
 
       break;
     case DYNAMIC:
-      switch(parentToken.pcdType) {
-        case FEATURE_FLAG:
-          if(isBuildUsedLibrary) {
-            hAutogenStr += String.format("extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", 
-                                         parentToken.cName);
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
-                                         parentToken.cName,
-                                         parentToken.cName);
-          } else {
-            hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", 
-                                         parentToken.cName, 
-                                         datum.toString());
-            hAutogenStr += String.format("extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", 
-                                         parentToken.cName);
-            cAutogenStr += String.format("const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
-                                         parentToken.cName,
-                                         parentToken.cName);
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
-                                         parentToken.cName,
-                                         parentToken.cName);
-          }
-          break;
-        case FIXED_AT_BUILD:
-          if(isBuildUsedLibrary) {
-            hAutogenStr += String.format("extern const %s _gPcd_FixedAtBuild_%s;\r\n",
-                                         Token.getAutogendatumTypeString(parentToken.datumType),
-                                         parentToken.cName);
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
-                                         parentToken.cName,
-                                         parentToken.cName);
-
-          } else {
-            hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", 
-                                         parentToken.cName, 
-                                         datum.toString());
-            hAutogenStr += String.format("extern const %s _gPcd_FixedAtBuild_%s\r\n",
-                                         Token.getAutogendatumTypeString(parentToken.datumType),
-                                         parentToken.cName);
-            cAutogenStr += String.format("const %s _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
-                                         parentToken.cName,
-                                         parentToken.cName);
-            hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
-                                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
-                                         parentToken.cName,
-                                         parentToken.cName);
-          }
-          break;
-        case PATCHABLE_IN_MODULE:
-          hAutogenStr += String.format("#define _PCD_VALUE_%s   %s\r\n", 
-                                       parentToken.cName, 
-                                       datum.toString());
-          hAutogenStr += String.format("extern %s _gPcd_BinaryPatch_%s;\r\n",
-                                       Token.getAutogendatumTypeString(parentToken.datumType),
-                                       parentToken.cName,
-                                       parentToken.cName);
-          cAutogenStr += String.format("%s _gPcd_BinaryPatch_%s = _PCD_VALUE_%s;",
-                                       Token.getAutogendatumTypeString(parentToken.datumType),
-                                       parentToken.cName,
-                                       parentToken.cName);
-          hAutogenStr += String.format("#define _PCD_MODE_%s_%s  _gPcd_BinaryPatch_%s\r\n",
-                                       Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
-                                       parentToken.cName,
-                                       parentToken.cName);
-          break;
-      case DYNAMIC:
-          hAutogenStr += String.format("#define _PCD_MODE_%s_%s  LibPcdGet%s(_PCD_TOKEN_%s)\r\n",
-                                       Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
-                                       parentToken.cName,
-                                       Token.getAutogenLibrarydatumTypeString(parentToken.datumType),
-                                       parentToken.cName);
-          break;
-      default:
-          throw new EntityException ("The PCD type is unknown");
-      }
-      break;
+       hAutogenStr += String.format("#define _PCD_MODE_%s_%s  LibPcdGet%s(_PCD_TOKEN_%s)\r\n",
+                                    Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                                    parentToken.cName,
+                                    Token.getAutogenLibrarydatumTypeString(parentToken.datumType),
+                                    parentToken.cName);
+       break;
     case DYNAMIC_EX:
       break;
     }
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java
index 661260d7bb..ed282e1b76 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java
@@ -109,16 +109,8 @@ public class PCDDatabaseFrame extends JFrame {
             tokenNode = new DefaultMutableTreeNode(token.cName);
             tokenNode.add(new DefaultMutableTreeNode(String.format("TOKEN NUMBER: 0x%08x", token.tokenNumber)));
             tokenNode.add(new DefaultMutableTreeNode("TOKEN SPACE NAME: " + token.tokenSpaceName.toString()));
-            tokenNode.add(new DefaultMutableTreeNode("PCD TYPE: " + Token.getStringOfpcdType(token.pcdType)));
             tokenNode.add(new DefaultMutableTreeNode("DATUM TYPE: " +Token.getStringOfdatumType(token.datumType)));
-            tokenNode.add(new DefaultMutableTreeNode("DATUM: " + token.datum.toString()));
-            tokenNode.add(new DefaultMutableTreeNode("HIIENABLE: " +(token.hiiEnabled?"true":"false")));
-            tokenNode.add(new DefaultMutableTreeNode("VARIABLE NAME: " + token.variableName));
             //tokenNode.add(new DefaultMutableTreeNode("VARIABLE GUID: " + token.variableGuid.toString()));
-            tokenNode.add(new DefaultMutableTreeNode("SKUENABLE: " +(token.skuEnabled?"true":"false")));
-            tokenNode.add(new DefaultMutableTreeNode(String.format("SKUID: %d", token.skuId)));
-            tokenNode.add(new DefaultMutableTreeNode(String.format("MAX SKU COUNT: %d", token.maxSkuCount)));
-            tokenNode.add(new DefaultMutableTreeNode("VPDENABLE: " +(token.vpdEnabled?"true":"false")));
 
             usageNode = new DefaultMutableTreeNode("PRODUCER");
             tokenNode.add(usageNode);
-- 
2.39.2