diff --git a/XmlSchemaClassGenerator.Tests/XmlTests.cs b/XmlSchemaClassGenerator.Tests/XmlTests.cs
index abd6af4f..ba67ef9d 100644
--- a/XmlSchemaClassGenerator.Tests/XmlTests.cs
+++ b/XmlSchemaClassGenerator.Tests/XmlTests.cs
@@ -106,7 +106,7 @@ public void CanDeserializeSampleXml()
             TestSamples("Client", ClientPattern);
             Compile("IS24RestApi", IS24Pattern);
             TestSamples("IS24RestApi", IS24Pattern);
-            Compile("Wadl", WadlPattern, new Generator { EntityFramework = true });
+            Compile("Wadl", WadlPattern, new Generator { EntityFramework = true, DataAnnotationMode = DataAnnotationMode.All });
             TestSamples("Wadl", WadlPattern);
         }
 
diff --git a/XmlSchemaClassGenerator.Tests/xsd/client/client.xsd b/XmlSchemaClassGenerator.Tests/xsd/client/client.xsd
index 3b3180ab..2b6daab8 100644
--- a/XmlSchemaClassGenerator.Tests/xsd/client/client.xsd
+++ b/XmlSchemaClassGenerator.Tests/xsd/client/client.xsd
@@ -10,20 +10,20 @@
   </xs:element>
   <xs:complexType name="MainClientFieldSets">
     <xs:all minOccurs="0">
-  
+
       <xs:element minOccurs="1" name="MainClientDetails" type="MainClientDetailsType" />
     </xs:all>
   </xs:complexType>
   <xs:complexType name="RelatedClientFieldSets">
     <xs:all minOccurs="0">
-    
+
       <xs:element minOccurs="1" name="RelatedClientDetails" type="RelatedClientDetailsType" />
     </xs:all>
   </xs:complexType>
-  
+
   <xs:complexType name="ClientDetailsType">
     <xs:sequence>
-  
+
       <xs:element minOccurs="1" maxOccurs="1" name="ClientName" type="MandatoryStringType" />
       <xs:element minOccurs="1" maxOccurs="1" name="IDNumber" type="MandatoryStringType" />
       <xs:element minOccurs="1" maxOccurs="1" name="LegalEntity">
@@ -56,7 +56,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  	<xs:complexType name="NameCodePairComplexType">
+  	<xs:complexType name="NameCodePairComplexType" mixed="true">
 		<xs:all>
 			<xs:element minOccurs="0" name="Name" type="xs:string" />
 			<xs:element name="Code" type="xs:string" />
@@ -88,7 +88,7 @@
         </xs:complexType>
       </xs:element>
       <xs:element minOccurs="1" maxOccurs="1" name="ClientParentUniqueID" type="MandatoryStringType" />
-     
+
     </xs:all>
   </xs:complexType>
   <xs:simpleType name="GUIDType">
@@ -117,7 +117,7 @@
               <xs:restriction base="xs:string">
                 <xs:enumeration value="A" />
                 <xs:enumeration value="B" />
-               
+
               </xs:restriction>
             </xs:simpleType>
           </xs:element>
@@ -125,7 +125,7 @@
             <xs:simpleType>
               <xs:restriction base="xs:string">
                 <xs:enumeration value="1" />
-                <xs:enumeration value="2" />              
+                <xs:enumeration value="2" />
               </xs:restriction>
             </xs:simpleType>
           </xs:element>
@@ -133,8 +133,8 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType name="RoleType">
-    <xs:complexContent mixed="false">
+  <xs:complexType name="RoleType" mixed="true">
+    <xs:complexContent>
       <xs:restriction base="NameCodePairComplexType">
         <xs:all>
           <xs:element minOccurs="0" name="Name">
@@ -142,7 +142,7 @@
               <xs:restriction base="xs:string">
                 <xs:enumeration value="c" />
                 <xs:enumeration value="d" />
-              
+
               </xs:restriction>
             </xs:simpleType>
           </xs:element>
@@ -151,7 +151,7 @@
               <xs:restriction base="xs:string">
                 <xs:enumeration value="3" />
                 <xs:enumeration value="4" />
-               
+
               </xs:restriction>
             </xs:simpleType>
           </xs:element>
diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
index 451d38f1..222cfa91 100644
--- a/XmlSchemaClassGenerator/TypeModel.cs
+++ b/XmlSchemaClassGenerator/TypeModel.cs
@@ -389,23 +389,6 @@ public List<ClassModel> GetAllDerivedTypes()
 
             return allDerivedTypes;
         }
-
-        public int TotalProperties
-        {
-            get
-            {
-                var elems = 0;
-                var clss = this;
-
-                while (clss != null)
-                {
-                    elems += clss.Properties.Count();
-                    clss = clss.BaseClass as ClassModel;
-                }
-
-                return elems;
-            }
-        }
     }
 
     public class PropertyModel
@@ -567,6 +550,7 @@ private void AddDocs(CodeTypeMember member)
             {
                 docs.AddRange(simpleType.Documentation);
                 docs.AddRange(simpleType.Restrictions.Select(r => new DocumentationModel { Language = "en", Text = r.Description }));
+                member.CustomAttributes.AddRange(simpleType.GetRestrictionAttributes().ToArray());
             }
 
             member.Comments.AddRange(DocumentationModel.GetComments(docs).ToArray());