diff --git a/EdkFatBinPkg/EdkFatBinPkg.spd b/EdkFatBinPkg/EdkFatBinPkg.spd
index 3a739581a5..f53b6974e3 100644
--- a/EdkFatBinPkg/EdkFatBinPkg.spd
+++ b/EdkFatBinPkg/EdkFatBinPkg.spd
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <SpdHeader>
     <PackageName>EdkFatBinPkg</PackageName>
     <Guid>0fd7197b-9bde-44fe-a7e4-d2177a9922e5</Guid>
-    <Version>0</Version>
+    <Version>0.3</Version>
     <Abstract>This is the Binary Package for the FAT dirver</Abstract>
     <Description>This package provides FAT drivers which are not licensed under BSD.</Description>
     <Copyright>Copyright (c) 2004,  Intel Corporation.</Copyright>
@@ -31,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <PackageType>BINARY</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </SpdHeader>
   <MsaFiles>
     <MsaFile>
diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index d307ce338a..4dcf32449b 100644
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <PlatformHeader>
-    <PlatformName>MdePkg</PlatformName>
-    <Abstract>EFI/Tiano MdePkg Package</Abstract>
+    <PlatformName>EdkModuleAll</PlatformName>
+    <GuidValue>dc967761-e6e9-4d1a-b02c-818102db4cc6</GuidValue>
+    <Version>0.3</Version>
+    <Abstract>EFI/Framework Reference Module Package for All Architectures</Abstract>
     <Description>This FPD file is used for Package Level build.</Description>
-    <Created>2006-04-03 13:40</Created>
-    <CreatedBy>lhauch</CreatedBy>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <CreatedDate>2006-02-24 14:49</CreatedDate>
+    <ModifiedDate>2006-06-03 22:14</ModifiedDate>
+    <BuildTarget>BOTH</BuildTarget>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </PlatformHeader>
   <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>
diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 712834717f..b95aa390ab 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <PlatformHeader>
     <PlatformName>EdkModule</PlatformName>
-    <GuidValue>b750cfa0-f8fa-4d6f-bb2d-39789751ef4b</GuidValue>
-    <Version>0.5</Version>
+    <GuidValue>dbb0551f-a04b-4038-9303-e60998023c8d</GuidValue>
+    <Version>0.3</Version>
     <Abstract>EFI/Tiano Edk Module Reference Designs Package</Abstract>
     <Description>This FPD file is used for Package Level build.</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
@@ -26,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
-    <CreatedDate>2006-04-03 13:40</CreatedDate>
+    <CreatedDate>2006-02-24 14:49</CreatedDate>
     <ModifiedDate>2006-06-01 17:59</ModifiedDate>
     <BuildTarget>DEBUG</BuildTarget>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 1f6bd4a635..1409f10301 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <SpdHeader>
     <PackageName>EdkModulePkg</PackageName>
     <Guid>0xb6ec423c, 0x21d2, 0x490d, 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74</Guid>
-    <Version>0</Version>
+    <Version>0.3</Version>
     <Abstract>Edk Module Package Reference Implementations</Abstract>
     <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>
     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>
@@ -31,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <PackageType>SOURCE</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </SpdHeader>
   <LibraryClassDeclarations>
     <LibraryClassDeclaration>
diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 08405602c4..ce03c472ae 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <SpdHeader>
     <PackageName>EdkNt32Pkg</PackageName>
     <Guid>0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3</Guid>
-    <Version>0</Version>
+    <Version>0.3</Version>
     <Abstract>This is the NT32 Emulation Environment Platform</Abstract>
     <Description>Reference platform implementation using an emulator.</Description>
     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>
@@ -31,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <PackageType>SOURCE</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </SpdHeader>
   <LibraryClassDeclarations>
     <LibraryClassDeclaration>
diff --git a/EdkShellBinPkg/EdkShellBinPkg.spd b/EdkShellBinPkg/EdkShellBinPkg.spd
index 439ecbc69a..85c5004ee1 100644
--- a/EdkShellBinPkg/EdkShellBinPkg.spd
+++ b/EdkShellBinPkg/EdkShellBinPkg.spd
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <SpdHeader>
     <PackageName>EdkShellBinPkg</PackageName>
     <Guid>d4266a1b-1d38-4116-93ae-60dc3e2012a6</Guid>
-    <Version>0</Version>
+    <Version>0.3</Version>
     <Abstract>Reference package showing multiple binaries</Abstract>
     <Description>This package contains multiple binary drivers, using only one MSA, one MBD and a single SPD.</Description>
     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>
@@ -31,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <PackageType>BINARY</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </SpdHeader>
   <MsaFiles>
     <MsaFile>
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index a25396f038..2be9874ef8 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <PlatformHeader>
-    <PlatformName>MdePkg</PlatformName>
+    <PlatformName>MdePkgAll</PlatformName>
+    <GuidValue>0fe7dd3e-0969-48c3-8cd2-de9a190088e2</GuidValue>
+    <Version>0.3</Version>
     <Abstract>EFI/Tiano MdePkg Package</Abstract>
     <Description>This FPD file is used for Package Level build.</Description>
-    <Created>2006-04-03 13:40</Created>
-    <CreatedBy>lhauch</CreatedBy>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <CreatedDate>2006-04-03 13:40</CreatedDate>
+    <ModifiedDate>2006-05-14 09:49</ModifiedDate>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </PlatformHeader>
   <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>
diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 477645d0c8..d19cd89acb 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <FrameworkPlatformDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <PlatformHeader>
     <PlatformName>MdePkg</PlatformName>
+    <GuidValue>1123e1a9-4d9b-499f-843c-b2297ff61a11</GuidValue>
+    <Version>0.3</Version>
     <Abstract>EFI/Tiano MdePkg Package</Abstract>
     <Description>This FPD file is used for Package Level build.</Description>
-    <Created>2006-04-03 13:40</Created>
-    <CreatedBy>lhauch</CreatedBy>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <CreatedDate>2006-02-24 14:49</CreatedDate>
+    <ModifiedDate>2006-05-14 09:49</ModifiedDate>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </PlatformHeader>
   <Flash>
     <FlashDefinitionFile>dummy.fdf</FlashDefinitionFile>
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index d9b30180d8..9fbb8a6ed1 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <SpdHeader>
     <PackageName>MdePkg</PackageName>
     <Guid>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</Guid>
-    <Version>0</Version>
-    <Abstract>FIX ME!</Abstract>
-    <Description>FIX ME!</Description>
+    <Version>0.3</Version>
+    <Abstract>Framework Module Development Environment Industry Standards</Abstract>
+    <Description>This Package provides headers and libraries that conform to EFI/Framework Industry standards.</Description>
     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>
-    <License> All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <License>
+      All rights reserved.
+      This program and the accompanying materials are licensed and made available under 
+      the terms and conditions of the BSD License which accompanies this distribution. 
+      The full text of the license may be found at 
+      http://opensource.org/licenses/bsd-license.php 
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+     </License>
     <Created>2006-03-18 19:02</Created>
     <Updated>2006-03-19 15:18</Updated>
     <URL>http://www.TianoCore.org</URL>
     <PackageType>SOURCE</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </SpdHeader>
   <LibraryClassDeclarations>
     <LibraryClassDeclaration>
diff --git a/Tools/Conf/FrameworkDatabase.db b/Tools/Conf/FrameworkDatabase.db
index 42f1051c33..3070d4c54f 100644
--- a/Tools/Conf/FrameworkDatabase.db
+++ b/Tools/Conf/FrameworkDatabase.db
@@ -16,7 +16,8 @@
       The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
       OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-</License>
+    </License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </FdbHeader>
   <PackageList>
     <Package>
@@ -35,8 +36,8 @@
     </Package>
     <Package>
       <PackageName>EdkNt32Pkg</PackageName>
-      <Guid>146fab65-922d-4bc3-b34b-cf1b0fe16eed</Guid>
-      <Version>0.01-test1</Version>
+      <Guid>0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3</Guid>
+      <Version>0.3</Version>
       <Path>EdkNt32Pkg/</Path>
       <InstalledDate>2006-02-22 13:25</InstalledDate>
     </Package>
@@ -49,39 +50,56 @@
     </Package>
     <Package>
       <PackageName>MdePkg</PackageName>
-      <Guid>18413569-8b0d-43b1-920f-c110aa37265d</Guid>
+      <Guid>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</Guid>
       <Version>0.3</Version>
       <Path>MdePkg/</Path>
-      <InstalledDate>2006-03-05 09:01</InstalledDate>
+      <InstalledDate>2006-03-18 19:02</InstalledDate>
     </Package>
     <Package>
       <PackageName>Tools</PackageName>
       <Guid>53f84ca0-53fe-4412-b4e7-dcec602e1d49</Guid>
-      <Version>0.1</Version>
+      <Version>0.3</Version>
       <Path>Tools/</Path>
       <InstalledDate>2006-02-24 14:49</InstalledDate>
     </Package>
+    <Package>
+      <PackageName>EdkFatPkg</PackageName>
+      <Guid>0x8EA68A2C, 0x99CB, 0x4332, 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74</Guid>
+      <Version>1.0</Version>
+      <Path>EdkFatPkg/</Path>
+      <InstalledDate>2006-03-05 09:49</InstalledDate>
+    </Package>
   </PackageList>
   <PlatformList>
-    <Platform PlatformName="NT32" PlatformGuid="eb216561-961f-47ee-9ef9-ca426ef547c2" PlatformVersion="1.0">
-      <File>EdkNt32Pkg/Nt32.fpd</File>
+    <Platform PlatformName="NT32" PlatformGuid="eb216561-961f-47ee-9ef9-ca426ef547c2" PlatformVersion="0.3">
+      <Filename>EdkNt32Pkg/Nt32.fpd</Filename>
+      <InstalledDate>2006-02-23 18:21</InstalledDate>
+      <ModifiedDate>2006-06-03 20:20</ModifiedDate>
+    </Platform>
+    <Platform PlatformName="NT32Test" PlatformGuid="b23bda70-806b-4c2c-85f3-1d7139cb9f12" PlatformVersion="0.3">
+      <Filename>EdkNt32Pkg/Nt32Test.fpd</Filename>
       <InstalledDate>2006-02-24 14:49</InstalledDate>
       <ModifiedDate>2006-05-14 09:49</ModifiedDate>
     </Platform>
-    <Platform PlatformName="MdePkgAll" PlatformGuid="0fe7dd3e-0969-48c3-8cd2-de9a190088e2" PlatformVersion="1.0">
-      <File>MdePkg/MdePkg-All-Archs.fpd</File>
+    <Platform PlatformName="MdePkgAll" PlatformGuid="0fe7dd3e-0969-48c3-8cd2-de9a190088e2" PlatformVersion="0.3">
+      <Filename>MdePkg/MdePkg-All-Archs.fpd</Filename>
       <InstalledDate>2006-02-24 14:49</InstalledDate>
       <ModifiedDate>2006-05-14 09:49</ModifiedDate>
     </Platform>
-    <Platform PlatformName="MdePkg" PlatformGuid="1123e1a9-4d9b-499f-843c-b2297ff61a11" PlatformVersion="1.0">
-      <File>MdePkg/MdePkg.fpd</File>
+    <Platform PlatformName="MdePkg" PlatformGuid="1123e1a9-4d9b-499f-843c-b2297ff61a11" PlatformVersion="0.3">
+      <Filename>MdePkg/MdePkg.fpd</Filename>
       <InstalledDate>2006-02-24 14:49</InstalledDate>
       <ModifiedDate>2006-05-14 09:49</ModifiedDate>
     </Platform>
-    <Platform PlatformName="EdkModuleAll" PlatformGuid="dc967761-e6e9-4d1a-b02c-818102db4cc6" PlatformVersion="1.0">
-      <File>EdkModulePkg/EdkModulePkg-All-Archs.fpd</File>
+    <Platform PlatformName="EdkModuleAll" PlatformGuid="dc967761-e6e9-4d1a-b02c-818102db4cc6" PlatformVersion="0.3">
+      <Filename>EdkModulePkg/EdkModulePkg-All-Archs.fpd</Filename>
       <InstalledDate>2006-02-24 14:49</InstalledDate>
-      <ModifiedDate>2006-05-14 09:49</ModifiedDate>
+      <ModifiedDate>2006-06-03 22:14</ModifiedDate>
+    </Platform>
+    <Platform PlatformName="EdkModule" PlatformGuid="dbb0551f-a04b-4038-9303-e60998023c8d" PlatformVersion="0.3">
+      <Filename>EdkModulePkg/EdkModulePkg.fpd</Filename>
+      <InstalledDate>2006-02-24 14:49</InstalledDate>
+      <ModifiedDate>2006-06-01 17:59</ModifiedDate>
     </Platform>
   </PlatformList>
 </FrameworkDatabase>
diff --git a/Tools/Tools.spd b/Tools/Tools.spd
index 5fd0a381f4..1737d28416 100644
--- a/Tools/Tools.spd
+++ b/Tools/Tools.spd
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
   <SpdHeader>
     <PackageName>Tools</PackageName>
     <Guid>53f84ca0-53fe-4412-b4e7-dcec602e1d49</Guid>
-    <Version>0.1</Version>
-    <Abstract>TianoCore.org EFI Tiano Tools</Abstract>
-    <Description> This package provides the tools needed to create EFI Tiano platform binary files (PBF) and EFI Tiano Modules that can be incorporated into a PBF. Source Code is provided for all C and Java applications. This package also provides the directory structure for holding configuration files. </Description>
+    <Version>0.3</Version>
+    <Abstract>TianoCore.org EFI Framework Tools</Abstract>
+    <Description> This package provides the tools needed to create EFI/Framework platform
+      binary files (PBF) and EFI/Framework Modules that can be incorporated into a PBF. 
+      Source Code is provided for all C and Java applications. This package also provides 
+      the directory structure and templates for configuration files.
+    </Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License> All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. </License>
-    <Created>2006-02-24 14:49</Created>
+    <License>
+      All rights reserved.
+      This program and the accompanying materials are licensed and made available
+      under the terms and conditions of the BSD License which accompanies this
+      distribution. The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <CreatedDate>2006-02-24 14:49</CreatedDate>
+    <ModifiedDate>2006-02-24 14:49</ModifiedDate>
     <URL>http://www.TianoCore.org</URL>
     <PackageType>MIXED</PackageType>
+    <ReadOnly>false</ReadOnly>
+    <RePackage>true</RePackage>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
   </SpdHeader>
   <MsaFiles>
   <!--
diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index cf95629f5c..4ed390e4b7 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -201,6 +201,7 @@
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
         <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>
         <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>
+        <xs:attribute name="ToolChainTag" type="xs:NCName" use="optional"/>
         <!-- DO NOT USE remove OverrideID from use -->
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
     </xs:attributeGroup>
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 08cbfd939b..8136662969 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -657,6 +657,13 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="IndustryStdHeaders">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="IncludeHeader"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="InstalledDate" type="DateType"/>
     <xs:element name="Libraries">
         <xs:annotation>
@@ -741,7 +748,7 @@
     </xs:element>
     <xs:element name="LibraryClassDefinitions">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This section defines what Classes of Libraries that this library belongs to. A Library may belong to multiple different library classes.</xs:documentation>
+            <xs:documentation xml:lang="en">This section defines what Classes of Library that this library supports. A Library may belong to multiple different library classes.</xs:documentation>
         </xs:annotation>
         <xs:complexType mixed="true">
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index 88300befff..a0223cb96f 100644
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">
-  <!--
+    <!--
     Filename: SurfaceArea.xsd
     
     Copyright (c) 2006, Intel Corp.
@@ -12,170 +12,172 @@
     WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     
   -->
-  <xs:include schemaLocation="FrameworkHeaders.xsd"/>
-  <xs:include schemaLocation="FrameworkDataElements.xsd"/>
-  <xs:include schemaLocation="FrameworkPlatformDataElements.xsd"/>
-  <xs:element name="FrameworkDatabase">
+    <xs:include schemaLocation="FrameworkHeaders.xsd"/>
+    <xs:include schemaLocation="FrameworkDataElements.xsd"/>
+    <xs:include schemaLocation="FrameworkPlatformDataElements.xsd"/>
     <xs:annotation>
-      <xs:documentation xml:lang="en">This is the valid format for the Package Database File. Note: MsaList is used for Modules that have not yet been included in a package.</xs:documentation>
+        <xs:documentation xml:lang="en">The following defines the valid format for the Framework Database (DB) File.</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>
-        <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDescriptions">
-          <xs:annotation>
-            <xs:documentation xml:lang="en">DO NOT USE! - Use PlatformList instead.</xs:documentation>
-          </xs:annotation>
-        </xs:element>    
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="FrameworkPlatformDescription">
+    <xs:element name="FrameworkDatabase">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>
+                <xs:choice>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>
+                    <!-- DO NOT USE! removing PlatformDescriptions, use PlatformList instead. -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDescriptions"/>
+                </xs:choice>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:annotation>
-      <xs:documentation xml:lang="en">This is the valid format for the Framework Platform Description (FPD) File.</xs:documentation>
+        <xs:documentation xml:lang="en">The following describes the valid format for the Framework Platform Description (FPD) File.</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="TianoImage">
-          <xs:annotation>
-            <xs:documentation xml:lang="en">DO NOT USE! - Use FrameworkModules instead.</xs:documentation>
-          </xs:annotation>
-        </xs:element>    
-        <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations">
-          <xs:annotation>
-            <xs:documentation xml:lang="en">DO NOT USE! - Use PcdBuildDeclaratiion in ModuleSA instead.</xs:documentation>
-          </xs:annotation>
-        </xs:element>    
-        <xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LibraryModuleBuildDescription">
+    <xs:element name="FrameworkPlatformDescription">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>
+                <!-- DO NOT USE! removing TianoImage, use FrameworkModules instead. -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="TianoImage"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>
+                <!-- DO NOT USE! removing PcdBuildDeclarations here, use PcdBuildDeclaratiion in ModuleSA instead. -->
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:annotation>
-      <xs:documentation xml:lang="en">DO NOT USE - PUT IN PLATFORM DESCRIPTION FILE, FPD</xs:documentation>
+        <xs:documentation xml:lang="en">DO NOT USE removing all Library Module files - PUT IN PLATFORM DESCRIPTION FILE, FPD</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="MbdLibHeader"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="LibraryModuleSurfaceArea">
+    <xs:element name="LibraryModuleBuildDescription">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MbdLibHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:annotation>
-      <xs:documentation xml:lang="en">DO NOT USE - USE MODULE DESCRIPTION FILE, MSA</xs:documentation>
+        <xs:documentation xml:lang="en">DO NOT USE Removing all Library Module files - USE MODULE DESCRIPTION FILE, MSA</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="MsaLibHeader"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
-        <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ModuleBuildDescription">
+    <xs:element name="LibraryModuleSurfaceArea">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MsaLibHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:annotation>
-      <xs:documentation xml:lang="en">DO NOT USE - PUT IN PLATFORM DESCRIPTION FILE, FPD</xs:documentation>
+        <xs:documentation xml:lang="en">DO NOT USE Removing Build Description files - PUT IN PLATFORM DESCRIPTION FILE, FPD or RecommendedInstance Attribute in MSA LibraryClass</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="MbdHeader"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ModuleSurfaceArea">
+    <xs:element name="ModuleBuildDescription">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MbdHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:annotation>
-      <xs:documentation xml:lang="en">This is the Module Surface Area Description that contains the list of the module's source files, library classes that can or must be used by the module, the Include Paths, Protocols and Ppi's that are either produced or consued.</xs:documentation>
+        <xs:documentation xml:lang="en">This is the Module Surface Area Description (MSA) that contains the list of the module's source files, library classes that can or must be used by the module, the Include Paths, Protocols and Ppi's that are either produced or consued.</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
-        <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="PackageSurfaceArea">
+    <xs:element name="ModuleSurfaceArea">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:choice minOccurs="0">
+                    <!-- DO NOT USE! removing PCDs, use MsaPcdDeclarations instead -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="MsaPcdDeclarations"/>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:annotation>
-      <xs:documentation xml:lang="en">This is valid content for a Package Surface Area Description (SPD) file.</xs:documentation>
+        <xs:documentation xml:lang="en">This describes the valid content for a Package Surface Area Description (SPD) file.</xs:documentation>
     </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PpiDeclarations"/>
-        <xs:element minOccurs="0" maxOccurs="1" ref="PcdDefinitions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
+    <xs:element name="PackageSurfaceArea">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdHeaders"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PpiDeclarations"/>
+                <xs:choice minOccurs="0">
+                    <!-- DO NOT USE! removing PcdDefinitions, use PcdDeclarations instead. -->
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdDefinitions"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdDeclarations"/>
+                </xs:choice>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 </xs:schema>