diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index eb4eb356e4..f02ec12d67 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -872,7 +872,7 @@
                             <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
                         </xs:sequence>
                         <xs:attributeGroup ref="PcdAttributes"/>
-                        <xs:attribute name="PcdIsDriver" use="optional">
+                        <xs:attribute name="PcdIsDriver" use="optional" />
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
@@ -1066,6 +1066,7 @@
                             <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>
@@ -1199,6 +1200,7 @@
                             <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>
@@ -1281,7 +1283,9 @@
                     </xs:complexType>
                 </xs:element>
                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                <!--
                 <xs:element minOccurs="0" maxOccurs="1" ref="File"/>
+                    -->
                 <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"/>