X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FEdkModulePkg-All-Archs.fpd;h=c318283e28cb2323ff4951ac0cb1c579c594c7ab;hp=dd4b712a0f3b1a57513c06a8412d582d04f3457b;hb=a2875f8c3d84540f2cdd65bc6cf4561207c55f89;hpb=8840ad589e758e0aa57982f5b7acfa898c63c409

diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index dd4b712a0f..c318283e28 100644
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -290,27972 +290,13598 @@
   <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>
-            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
               <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
                 <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
               <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
                 <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
               <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
                 <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
               <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
                 <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</DatumSize>
-            <VariableGuid>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>
+            <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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>0x80000000</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData ItemType="FIXED_AT_BUILD">
+            <MaxDatumSize>4</MaxDatumSize>
+            <Value>0x80000000</Value>
+          </PcdData>
+          <PcdData ItemType="FIXED_AT_BUILD">
             <C_Name>PcdReportStatusCodePropertyMask</C_Name>
             <Token>0x00000007</Token>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</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>1</DatumSize>
-            <VariableGuid>0</VariableGuid>
-            <VariableName>L""</VariableName>
-            <DataOffset>0</DataOffset>
-            <DefaultValue>0x07</DefaultValue>
-          </PcdBuildData>
-          <PcdBuildData 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>
+            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>
             <DatumType>UINT8</DatumType>
-            <HiiEnable>false</HiiEnable>
-            <VpdEnable>false</VpdEnable>
-            <AlternateNameSpaceEnable>false</AlternateNameSpaceEnable>
-            <SkuEnable>false</SkuEnable>
-            <SkuDataArrayEnable>false</SkuDataArrayEnable>
-            <MaxSku>0</MaxSku>
-            <SkuId>0</SkuId>
-            <DatumSize>1</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>