diff --git a/EdkFatBinPkg/EdkFatBinPkg.spd b/EdkFatBinPkg/EdkFatBinPkg.spd
index f53b6974e3..d5cc49c635 100644
--- a/EdkFatBinPkg/EdkFatBinPkg.spd
+++ b/EdkFatBinPkg/EdkFatBinPkg.spd
@@ -15,10 +15,6 @@
       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-05 09:49</Created>
-    <Updated>2006-03-19 16:18</Updated>
-    <URL>http://www.TianoCore.org</URL>
-    <PackageType>BINARY</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 1409f10301..13de188d1c 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -15,10 +15,6 @@
       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-02-21 17:43</Created>
-    <Updated>2006-03-19 16:26</Updated>
-    <URL>http://www.TianoCore.org</URL>
-    <PackageType>SOURCE</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index ce03c472ae..cf8cb69e09 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -15,10 +15,6 @@
       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-02-22 13:25</Created>
-    <Updated>2006-03-22 16:18</Updated>
-    <URL>http://www.TianoCore.org</URL>
-    <PackageType>SOURCE</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
diff --git a/EdkShellBinPkg/EdkShellBinPkg.spd b/EdkShellBinPkg/EdkShellBinPkg.spd
index 85c5004ee1..48f0abeff6 100644
--- a/EdkShellBinPkg/EdkShellBinPkg.spd
+++ b/EdkShellBinPkg/EdkShellBinPkg.spd
@@ -15,10 +15,6 @@
       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-05 10:13</Created>
-    <Updated>2006-03-18 20:23</Updated>
-    <URL>http://www.TianoCore.org</URL>
-    <PackageType>BINARY</PackageType>
     <ReadOnly>true</ReadOnly>
     <RePackage>false</RePackage>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 9b060d82bb..98eb6630a6 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -17,10 +17,6 @@
       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>
diff --git a/Tools/Conf/FrameworkDatabase.db b/Tools/Conf/FrameworkDatabase.db
index 3070d4c54f..b09cf8ecb7 100644
--- a/Tools/Conf/FrameworkDatabase.db
+++ b/Tools/Conf/FrameworkDatabase.db
@@ -4,8 +4,6 @@
     <DatabaseName>FrameworkDatabase</DatabaseName>
     <Guid>5ce32c23-6448-43ab-b509-a9deae3aae65</Guid>
     <Version>0.3</Version>
-    <Created>2006-03-04 22:14</Created>
-    <Updated>2006-03-06 16:56</Updated>
     <Abstract>The Framework Module Development Packaging System Database</Abstract>
     <Description>This Database tracks the Basename, Version, Guid and Path for all packages installed in this workspace.</Description>
     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>
diff --git a/Tools/Tools.spd b/Tools/Tools.spd
index 1737d28416..f8f66bd456 100644
--- a/Tools/Tools.spd
+++ b/Tools/Tools.spd
@@ -20,10 +20,6 @@
       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>
diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 8ec39f5480..347b05c082 100644
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -240,6 +240,11 @@
             <xs:enumeration value="PRIVATE"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="HexWordArrayType">
+      <xs:restriction base="xs:normalizedString">
+         <xs:pattern value="((( )?0x[a-fA-F0-9]{4})(,)?)+( )?"/>
+      </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="HiiPackageUsage">
         <xs:restriction base="NameConvention">
             <xs:enumeration value="ALWAYS_PRODUCED"/>
@@ -458,7 +463,7 @@
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="VariableNameDataType">
-        <xs:list itemType="HexWordDataType"/>
+        <xs:list itemType="HexWordArrayType"/>
     </xs:simpleType>
     <xs:simpleType name="UsageTypes">
         <xs:restriction base="NameConvention">
diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 7dd823aa15..c146f26b6f 100644
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -254,7 +254,7 @@
                 <!-- URL needs to be removed -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>
                 <!-- PackageType needs to be removed -->
-                <xs:element minOccurs="1" maxOccurs="1" ref="PackageType"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>
                 <!-- ReadOnly and RePackage remain in final -->
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>