diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 21b63fd222..4a2d503d37 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -152,6 +152,8 @@
     <xs:attribute name="ModuleGuid" type="GuidType" use="required"/>
     <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>
     <xs:attribute name="PackageVersion" type="VersionDataType" use="optional"/>
+    <xs:attribute name="ForceDebug" type="xs:boolean" default="false" use="optional"/>
+    <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
   </xs:attributeGroup>
   <xs:attributeGroup name="OptionAttributes">
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 1110ceda78..0695932c7d 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -72,7 +72,7 @@
               <xs:element minOccurs="0" maxOccurs="unbounded" name="Attribute">
                 <xs:complexType>
                   <xs:attribute name="Name" type="C_NameType"/>
-                  <xs:attribute name="Value" type="C_NameType"/>
+                  <xs:attribute name="Value" type="xs:string"/>
                 </xs:complexType>
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Sections">
@@ -828,7 +828,7 @@
           <xs:complexType>
             <xs:simpleContent>
               <xs:extension base="PathAndFilename">
-                <xs:attribute name="MacroName" type="KeywordType" use="required"/>    
+                <xs:attribute name="MacroName" type="KeywordType" use="required"/>
               </xs:extension>
             </xs:simpleContent>
           </xs:complexType>
diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index c4be3b919b..6ce32d20f0 100644
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -105,6 +105,7 @@
         <xs:element minOccurs="1" maxOccurs="1" name="BuildTargets" type="BuildTargetList"/>
         <xs:element default="UNIFIED" name="IntermediateDirectories" type="IntermediateOutputType"/>
         <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory" type="xs:anyURI"/>
+        <xs:element minOccurs="0" maxOccurs="1" name="ForceDebugTarget" type="KeywordType"/>
         <!-- SkuInfo is only defined if Sku enabled -->
         <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>
         <xs:element minOccurs="0" maxOccurs="1" ref="FlashDeviceDefinitions"/>