diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 5e6bf5bcbf..4fdd9883c3 100644
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -132,6 +132,9 @@
         <!-- DO NOT USE remove Arch from use, use SupArchList instead -->
         <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
+        <xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>
+        <xs:attribute name="ModuleVersion" type="VersionDataType" use="optional"/>
+        <xs:attribute name="ModuleGuid" type="GuidType" use="optional"/>
         <!-- DO NOT USE remove EnableFeature from use -->
         <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 69ff209f46..c6bf6b2d09 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -858,6 +858,7 @@
     <xs:element name="ModuleUnloadImage" type="xs:normalizedString"/>
     <xs:element name="MsaFiles">
         <xs:complexType>
+          <xs:choice minOccurs="1" maxOccurs="unbounded">
             <xs:sequence minOccurs="1">
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="MsaFile">
                     <xs:annotation>
@@ -892,6 +893,8 @@
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="unbounded" ref="Filename"/>
+          </xs:choice>
         </xs:complexType>
     </xs:element>
     <!-- Use in Final -->