X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FXMLSchema%2FFrameworkDataElements.xsd;h=65db34a3248aaf67b1333f6867a7e9f7d42c32d5;hp=bbc75d9729d7d441d7492ca1c576cd3232e4908e;hb=be05f52305806ed3264afee1d0e1d4bc4183b0d4;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index bbc75d9729..65db34a324 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -17,6 +17,7 @@
     </xs:annotation>
     <xs:include schemaLocation="NamingConvention.xsd"/>
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
+    <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>
     <xs:element name="Abstract">
         <xs:annotation>
             <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>
@@ -25,7 +26,7 @@
         <xs:complexType>
             <xs:simpleContent>
                 <xs:extension base="Sentence">
-                    <xs:attribute name="URL" type="xs:anyURI"/>
+                    <xs:attribute name="URL" type="xs:anyURI" use="optional"/>
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
@@ -111,6 +112,7 @@
                             </xs:simpleContent>
                         </xs:complexType>
                     </xs:element>
+                    <!-- Arch element should be removed - use Arch attributes to the above instead. -->
                     <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                         <xs:complexType>
                             <xs:sequence minOccurs="1">
@@ -147,18 +149,8 @@
             <xs:documentation xml:lang="en">Describe the valid Framework Component Type</xs:documentation>
         </xs:annotation>
     </xs:element>
-    <xs:element name="Condition">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">A conditional expression that must be evaluated to determine whether a feature is implemented or not. The expression must be either numeric, string or boolean.</xs:documentation>
-        </xs:annotation>
-        <xs:complexType mixed="true">
-            <xs:sequence minOccurs="0" maxOccurs="1">
-                <xs:element minOccurs="0" maxOccurs="1" name="Condition" type="xs:normalizedString"/>
-            </xs:sequence>
-            <xs:attribute name="ConditionalTarget" type="ConditionalTarget" use="optional"/>
-        </xs:complexType>
-    </xs:element>
     <xs:element name="ConditionalExpression">
+        <!-- DO NOT USE remove and use FeatureFlag instead -->
         <xs:annotation>
             <xs:documentation xml:lang="en">A conditional expression that must be evaluated to determine whether a feature is implemented or not. The expression must be either numeric, string or boolean.</xs:documentation>
         </xs:annotation>
@@ -172,6 +164,7 @@
     <xs:element name="Constructor" type="C_Name"/>
     <xs:element name="Copyright" type="Sentence"/>
     <xs:element name="Created" type="DateType"/>
+    <xs:element name="CreatedDate" type="DateType"/>
     <xs:element name="CreatedBy" type="UserName"/>
     <xs:element name="DataHubs">
         <xs:annotation>
@@ -188,6 +181,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- Remove Arch and use Arch Attribute for DataHubRecord instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -252,11 +246,15 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                        <xs:choice minOccurs="0">
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                                        </xs:choice>
                                     </xs:sequence>
                                     <xs:attributeGroup ref="EventAttributes"/>
                                 </xs:complexType>
                             </xs:element>
+                            <!-- Remove Arch Section and use Arch Attribute instead in Event. -->
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                                 <xs:complexType>
                                     <xs:sequence>
@@ -264,7 +262,10 @@
                                             <xs:complexType>
                                                 <xs:sequence>
                                                     <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                                    <xs:choice minOccurs="0">
+                                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                                        <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                                                    </xs:choice>
                                                 </xs:sequence>
                                                 <xs:attributeGroup ref="EventAttributes"/>
                                             </xs:complexType>
@@ -286,11 +287,15 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                        <xs:choice minOccurs="0">
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                                        </xs:choice>
                                     </xs:sequence>
                                     <xs:attributeGroup ref="EventAttributes"/>
                                 </xs:complexType>
                             </xs:element>
+                            <!-- Remove Arch and use Arch attribute in Event above -->
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                                 <xs:complexType>
                                     <xs:sequence>
@@ -298,7 +303,6 @@
                                             <xs:complexType>
                                                 <xs:sequence>
                                                     <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                                                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
                                                 </xs:sequence>
                                                 <xs:attributeGroup ref="EventAttributes"/>
                                             </xs:complexType>
@@ -320,8 +324,9 @@
             <xs:documentation xml:lang="en">This is a list of Extern statements, right now, only Driver Binding information is provided.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
-            <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                <xs:element name="Extern">
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="1" name="PcdIsDriver" type="PcdDriverTypes"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">
                     <xs:complexType>
                         <xs:choice minOccurs="1">
                             <xs:sequence minOccurs="0" maxOccurs="1">
@@ -360,6 +365,8 @@
                         <xs:attributeGroup ref="ExternAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
+                <!-- Remove Arch and use Arch Attribute in above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -446,6 +453,7 @@
         <xs:complexType>
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>
+                <!-- DO NOT USE Arch remove it element and use Arch Attribute to Filename instead -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -475,6 +483,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE! removing Arch element, use Arch attribute in Formset instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -516,7 +525,10 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:choice minOccurs="1">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            </xs:choice>
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
                         </xs:sequence>
                         <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
@@ -537,6 +549,7 @@
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                             <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                            <!-- DO NOT USE remove ConditionalExpression and use FeatureFlag instead -->
                             <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>
                             <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
@@ -544,6 +557,7 @@
                         <xs:attributeGroup ref="GuidAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch, Arch should be removed and the attribute Arch should be used in the above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -556,6 +570,7 @@
                                         <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                                         <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
                                         <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                                        <!-- DO NOT USE remove ConditionalExpression and use FeatureFlag instead -->
                                         <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>
                                         <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>
                                         <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
@@ -584,11 +599,15 @@
                         <xs:sequence>
                             <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:normalizedString"/>
                             <xs:element minOccurs="0" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                            <xs:choice minOccurs="0">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            </xs:choice>
                         </xs:sequence>
                         <xs:attributeGroup ref="HobAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch, use attribute Arch for Hob in above -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -626,6 +645,7 @@
         <xs:complexType>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="PackageName"/>
+                <!-- remove Arch element, start using the Arch attribute for the PackageName element above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -637,22 +657,30 @@
             </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>
-            <xs:documentation xml:lang="en">Different Instances of Libraries</xs:documentation>
+            <xs:documentation xml:lang="en">Different (Module) Instances of Libraries used ONLY in FPD Files.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Library">
                     <xs:complexType>
                         <xs:simpleContent>
-                            <xs:extension base="BaseNameConvention">
+                            <xs:extension base="xs:NCName">
                                 <xs:attributeGroup ref="LibraryAttributes"/>
                             </xs:extension>
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- remove Arch Element HERE, start using the Arch attribute in Library element above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:choice minOccurs="1" maxOccurs="unbounded">
@@ -669,17 +697,18 @@
                         <xs:attribute name="ArchType" type="SupportedArchitectures"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- /remove Arch Element -->
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     <xs:element name="LibraryClass">
         <xs:annotation>
-            <xs:documentation xml:lang="en">Define in the MSA and/or SPD, what class of library is being produced by a library module - for components, it can also specify what class of library is consumed.</xs:documentation>
+            <xs:documentation xml:lang="en">Used in MSA files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
                 <xs:extension base="BaseNameConvention">
-                    <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>
+                    <xs:attributeGroup ref="LibraryClassAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
@@ -690,7 +719,19 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence minOccurs="0">
-                <xs:element minOccurs="1" maxOccurs="1" ref="LibraryClass"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="LibraryClass">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Used in MSA and SPD files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="BaseNameConvention">
+                                <xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>
+                                <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
                 <xs:element minOccurs="1" maxOccurs="1" ref="IncludeHeader"/>
             </xs:sequence>
         </xs:complexType>
@@ -707,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">
@@ -719,12 +760,13 @@
         <xs:complexType>
             <xs:simpleContent>
                 <xs:extension base="Paragraph">
-                    <xs:attribute name="URL" type="xs:anyURI"/>
+                    <xs:attribute name="URL" type="xs:anyURI" use="optional"/>
                 </xs:extension>
             </xs:simpleContent>
         </xs:complexType>
     </xs:element>
     <xs:element name="Modified" type="DateType"/>
+    <xs:element name="ModifiedDate" type="DateType"/>
     <xs:element name="Module">
         <xs:annotation>
             <xs:documentation xml:lang="en">This is record format for a Module entry in the Framework Database file.</xs:documentation>
@@ -735,7 +777,10 @@
             </xs:annotation>
             <xs:sequence>
                 <xs:element minOccurs="1" maxOccurs="1" ref="ModuleName"/>
-                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:choice minOccurs="1">
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                </xs:choice>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
                 <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
             </xs:sequence>
@@ -758,7 +803,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
-                <xs:extension base="BaseNameConvention">
+                <xs:extension base="xs:NCName">
                     <xs:attributeGroup ref="ModuleNameAttributes"/>
                 </xs:extension>
             </xs:simpleContent>
@@ -775,7 +820,7 @@
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="MsaFile">
                     <xs:annotation>
-                        <xs:documentation xml:lang="en">Describe the valid content of a Surface Area Package Description (SPD) file</xs:documentation>
+                        <xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>
                     </xs:annotation>
                     <xs:complexType>
                         <xs:sequence minOccurs="0" maxOccurs="1">
@@ -785,6 +830,7 @@
                         <xs:attributeGroup ref="MsaAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch element, use attribute Arch in above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -807,6 +853,48 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="MsaPcdDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdEntry">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->
+                        <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="MsaFileList">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Filename">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="xs:anyURI">
+                                <xs:attributeGroup ref="ModuleNameSaAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="OutputDirectory">
         <xs:annotation>
             <xs:documentation xml:lang="en">Define where we want our output to go. The Attribute, IntermediateDirectories, default MODULE, says that intermediate files will be local to the module, versus a unified directory structure.</xs:documentation>
@@ -827,6 +915,7 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="PCDs">
+        <!-- PCDs section is going away to be replaced by something else TB Named later -->
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Module Surface Area documents, MSA and MBD files, Library Modules and Other Modules</xs:documentation>
             <xs:documentation xml:lang="en">One or more PcdData or PcdBuildData Elements Only one type is permitted</xs:documentation>
@@ -843,6 +932,7 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
@@ -851,17 +941,7 @@
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
                             <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="MaxSku" type="HexByteDataType"/>
                             <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuId" type="HexByteDataType"/>
-                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize">
-                                <xs:annotation>
-                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>
-                                </xs:annotation>
-                                <xs:simpleType>
-                                    <xs:restriction base="xs:int">
-                                        <xs:minInclusive value="1"/>
-                                        <xs:maxInclusive value="16777215"/>
-                                    </xs:restriction>
-                                </xs:simpleType>
-                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
                             <xs:element minOccurs="0" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>
@@ -870,6 +950,7 @@
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
+                        <xs:attribute name="PcdIsDriver" use="optional"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -898,7 +979,7 @@
     </xs:element>
     <xs:element name="PackageList">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all packages installed in a workspace.</xs:documentation>
+            <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all packages installed in a workspace. (Database)</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:sequence maxOccurs="unbounded">
@@ -909,9 +990,19 @@
                     <xs:complexType>
                         <xs:sequence maxOccurs="unbounded">
                             <xs:element minOccurs="0" maxOccurs="1" ref="PackageName"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
+                            <xs:choice minOccurs="0">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <!-- DO NOT USE Guid should be removed, use PackageGuid instead -->
+                                <xs:element minOccurs="0" maxOccurs="1" name="PackageGuid" type="GuidType"/>
+                            </xs:choice>
+                            <xs:choice minOccurs="0">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>
+                                <xs:element minOccurs="0" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>
+                            </xs:choice>
+                            <xs:choice minOccurs="1">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Filename"/>
+                            </xs:choice>
                             <xs:element minOccurs="1" maxOccurs="1" ref="InstalledDate"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PackageAttributes"/>
@@ -922,7 +1013,7 @@
     </xs:element>
     <xs:element name="PackageName">
         <xs:annotation>
-            <xs:documentation xml:lang="en">This tag is used in the Package Surface Area Description File to track package dependencies for a module</xs:documentation>
+            <xs:documentation xml:lang="en">This tag is used in the Package Surface Area Description File to track package dependencies for a module (SPD) </xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:simpleContent>
@@ -947,8 +1038,7 @@
     </xs:element>
     <xs:element name="PcdBuildDeclarations">
         <xs:annotation>
-            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
-            <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>
+            <xs:documentation xml:lang="en">NEW: Will become a child of ModuleSA in the FPD</xs:documentation>
         </xs:annotation>
         <xs:complexType>
             <xs:choice minOccurs="1">
@@ -975,6 +1065,7 @@
                                     </xs:simpleContent>
                                 </xs:complexType>
                             </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
@@ -1049,24 +1140,268 @@
                                     <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>
                                 </xs:annotation>
                             </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">If HII is enabled, This is the offset into the variable data entry, If Vpd is enabled, then it's the Offset into the VPD area of the image defined by platform manufacturer, if neither HII nor Vpd are enabled, it's the offset into the PCD Data Area. HII and VPD can never be enabled at the same time (as of the date of this document.)</xs:documentation>
                                 </xs:annotation>
                             </xs:element>
-                            <xs:element minOccurs="1" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType">
+                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType">
                                 <xs:annotation>
-                                    <xs:documentation xml:lang="en">This field is only valid if AlternateNameSpaceEnable is true.</xs:documentation>
+                                    <xs:documentation xml:lang="en">FIELD IS NOT USED! REMOVE in FINAL!</xs:documentation>
                                 </xs:annotation>
                             </xs:element>
                             <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
+                        <xs:attribute name="PcdIsDriver">
+                            <xs:simpleType>
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>
+                                </xs:annotation>
+                                <xs:restriction base="UCNameType">
+                                    <xs:enumeration value="PEI_PCD_DRIVER"/>
+                                    <xs:enumeration value="DXE_PCD_DRIVER"/>
+                                </xs:restriction>
+                            </xs:simpleType>
+                        </xs:attribute>
                     </xs:complexType>
                 </xs:element>
             </xs:choice>
         </xs:complexType>
     </xs:element>
+    <!-- PcdBuildDeclarations -->
+    <xs:element name="PcdDynamicBuildDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
+            <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>
+                        <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</xs:documentation>
+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>
+                                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>
+                                </xs:annotation>
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="HexDoubleWordDataType">
+                                            <xs:attribute name="Target" type="C_Name" use="optional"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
+                            <xs:choice minOccurs="0">
+                                <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">
+                                    <xs:annotation>
+                                        <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>
+                                    </xs:annotation>
+                                    <xs:simpleType>
+                                        <xs:list itemType="xs:normalizedString"/>
+                                    </xs:simpleType>
+                                </xs:element>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
+                                    <xs:annotation>
+                                        <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>
+                                    </xs:annotation>
+                                    <xs:complexType>
+                                        <xs:sequence minOccurs="1">
+                                            <xs:element name="Id" type="xs:int"/>
+                                            <xs:element name="Value" type="xs:normalizedString"/>
+                                        </xs:sequence>
+                                    </xs:complexType>
+                                </xs:element>
+                            </xs:choice>
+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableValueDefault" type="xs:normalizedString"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                        <xs:attribute name="PcdIsDriver">
+                            <xs:simpleType>
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is an enumerated data type that will be used for DYNAMIC_EX, PEIM or DXE only</xs:documentation>
+                                </xs:annotation>
+                                <xs:restriction base="UCNameType">
+                                    <xs:enumeration value="PEI_PCD_DRIVER"/>
+                                    <xs:enumeration value="DXE_PCD_DRIVER"/>
+                                </xs:restriction>
+                            </xs:simpleType>
+                        </xs:attribute>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="DynamicPcdBuildDefinitions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
+            <xs:documentation xml:lang="en">FPD uses this PCD information for Dynamic PCDs Only</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>
+                            <xs:choice minOccurs="0" maxOccurs="1">
+                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>
+                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>
+                            </xs:choice>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PcdBuildDefinition">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of FPD ModuleSA element for FIXED_AT_BUILD, PATCHABLE_IN_MODULE, and FEATURE_FLAG PCDS Only!</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdData">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>
+                            <xs:choice minOccurs="0" maxOccurs="1">
+                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>
+                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>
+                            </xs:choice>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:group name="HiiEnable">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="VariableOffset" type="Hex64BitDataType"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:group name="VpdEnable">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">If VpdEnable group is specified, then VpdEnable is default true</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:group name="SkuGroup">
+        <xs:sequence>
+            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuSet" type="SkuListType"/>
+            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuList" type="SkuListType"/>
+            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
+                <xs:complexType>
+                    <xs:sequence minOccurs="1">
+                        <xs:element name="Id" type="xs:int"/>
+                        <xs:element name="Value" type="xs:normalizedString"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:group>
+    <xs:element name="PcdCoded">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdEntry">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->
+                        <xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PcdDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
+            <xs:documentation xml:lang="en">This permits entering information about a package's PCD information</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdEntry">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>
+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <!-- DO NOT USE removing PcdDefinitions, use PcdDeclarations for SPD entries  Use PcdBuildDeclarations for MSA Entires and PcdDynamicBuildDeclarations for FPD Entries -->
     <xs:element name="PcdDefinitions">
         <xs:annotation>
             <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
@@ -1084,6 +1419,7 @@
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
                             <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
@@ -1121,7 +1457,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="PlatformName">
+                <xs:element minOccurs="0" maxOccurs="1" name="PlatformName">
                     <xs:annotation>
                         <xs:documentation xml:lang="en">Define the Name of a Platform</xs:documentation>
                     </xs:annotation>
@@ -1133,7 +1469,12 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
-                <xs:element ref="Path"/>
+                <xs:choice minOccurs="0">
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Filename"/>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="1" ref="InstalledDate"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="AlternatePcdFile" type="FileNameConvention"/>
                 <xs:element minOccurs="0" maxOccurs="1" name="AlternateFdfFile" type="FileNameConvention"/>
             </xs:sequence>
@@ -1147,8 +1488,11 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
-                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                            <xs:choice>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            </xs:choice>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="xs:normalizedString"/>
                         </xs:sequence>
                         <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
                     </xs:complexType>
@@ -1180,6 +1524,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch element, use Arch Attribute in above instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -1248,6 +1593,7 @@
                         </xs:simpleContent>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE! removing Arch element, use Arch attribute of Protocol or ProtocolNotify instead. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>
@@ -1327,6 +1673,7 @@
         <xs:complexType>
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>
+                <!-- DO NOT USE! removing Arch element, use Arch Attribute of Filename instead.  -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence minOccurs="1">
@@ -1368,6 +1715,7 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="Updated" type="DateType"/>
+    <xs:element name="UpdatedDate" type="DateType"/>
     <xs:element name="URL" type="xs:anyURI"/>
     <xs:element name="URI" type="xs:anyURI"/>
     <xs:element name="UserDefinedAntTasks">
@@ -1381,6 +1729,16 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="UserExtensions">
+        <xs:complexType>
+            <xs:complexContent mixed="true">
+                <xs:extension base="xs:anyType">
+                    <xs:attribute name="UserID" type="xs:NCName" use="required"/>
+                    <xs:attribute name="Identifier" type="xs:integer" use="required"/>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="Variables">
         <xs:annotation>
             <xs:documentation xml:lang="en">A list of EFI Variables described by GUID string pair.</xs:documentation>
@@ -1394,7 +1752,10 @@
                     <xs:complexType>
                         <xs:sequence>
                             <xs:element minOccurs="1" maxOccurs="1" name="String" type="xs:normalizedString"/>
-                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:choice minOccurs="1">
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            </xs:choice>
                             <xs:element minOccurs="0" maxOccurs="1" name="ByteOffset" type="HexWordDataType">
                                 <xs:annotation>
                                     <xs:documentation xml:lang="en">This entry represents the Hex Byte Offset {0x0, 0xn} to where the data starts.</xs:documentation>
@@ -1426,6 +1787,7 @@
                         <xs:attributeGroup ref="VariableAttributes"/>
                     </xs:complexType>
                 </xs:element>
+                <!-- DO NOT USE Arch element, use attribute Arch in above. -->
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
                     <xs:complexType>
                         <xs:sequence>