diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/assocdefinition.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/assocdefinition.lib.ftl
index a6d8cb4ad7..df69128b93 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/assocdefinition.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/assocdefinition.lib.ftl
@@ -45,7 +45,15 @@
 	"many" : ${assocdefs.isTargetMany()?string}
      },
    <#if assocdefs.isChild() == true>
-    "url" : "${"/api/classes/" + url.templateArgs.classname + "/childassociation/" + assocdefs.name.toPrefixString()?replace(":","_")}"
+    <#if assocdefs.getRequiredChildName()?exists>
+    "requiredChildName" : "${assocdefs.getRequiredChildName()}",
+    </#if>
+    <#if assocdefs.getDuplicateChildNamesAllowed() == true>
+	    "duplicateChildNameAllowed" : true,
+	    <#else>
+	    "duplicateChildNameAllowed" : false,
+	</#if>
+	"url" : "${"/api/classes/" + url.templateArgs.classname + "/childassociation/" + assocdefs.name.toPrefixString()?replace(":","_")}"
    <#else>
     "url" : "${"/api/classes/" + url.templateArgs.classname + "/association/" + assocdefs.name.toPrefixString()?replace(":","_")}"
    </#if>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classdetails.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classdetails.lib.ftl
index 7c2bf99627..e197e943f0 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classdetails.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classdetails.lib.ftl
@@ -26,6 +26,17 @@
           "url" : "${"/api/classes/" + classdefs.parentName.toPrefixString()?replace(":","_")}"
         </#if>
       },
+     "defaultValues" : {
+      <#if classdefs.defaultValues?exists>
+     <#assign keys = classdefs.defaultValues?keys>
+	<#list keys as key>
+	"${key.toPrefixString()}" : {
+			"name" : "${key.toPrefixString()}",
+			"url" : "${"/api/classes/" + classdefs.name.toPrefixString()?replace(":","_") + "/property/" + key.toPrefixString()?replace(":","_")}"
+	 }<#if key_has_next>,</#if>
+	</#list>
+      </#if>
+     }, 
      "defaultAspects" : {
        <#if classdefs.defaultAspects?exists>
          <#list classdefs.defaultAspects as aspectdef>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
index 72d9037970..1bf21de50c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
@@ -25,16 +25,20 @@
        	"indexed" : ${propertydefs.indexed?string},
        	"indexedAtomically" : ${propertydefs.indexedAtomically?string},
        	"constraints" :
-       	[
+       	[<#--
        	<#if propertydefs.constraints?exists>
-       		<#list propertydefs.constraints as constraintdefs>
-       			{ <#--constraintdefs.getConstraint()[key]
-       			<#assign keys = constraintdefs.getConstraint()?keys>
-				<#list keys as key>"${key}" : <#if constraintdefs.getConstraint()[key]?exists>"${constraintdefs.getConstraint()[key]}"</#if><#if key_has_next>,</#if>   
-				</#list> -->
-       			}<#if constraintdefs_has_next>,</#if>
-			</#list>
-		</#if>
+		 <#list propertydefs.constraints as constraintdefs>
+		{ 
+		<#assign keys = constraintdefs.getConstraint()?keys>
+			<#list keys as key>
+				<#if key == "expression">
+				"${key}" : <#if constraintdefs.getConstraint()[key]?exists>"${constraintdefs.getConstraint()[key]}" <#else>"has no value"</#if>
+				</#if>
+				<#if key_has_next>,</#if>   
+			</#list> 
+		}<#if constraintdefs_has_next>,</#if>
+		</#list>
+	</#if>-->
        	],
        	"url" : "${"/api/classes/" +  url.templateArgs.classname + "/property/" + propertydefs.name.toPrefixString()?replace(":","_")}"
    }
diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryServiceTest.java b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryServiceTest.java
index 645e886166..148f800934 100644
--- a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryServiceTest.java
@@ -297,13 +297,13 @@ public class DictionaryServiceTest extends BaseWebScriptTest
 		GetRequest req = new GetRequest(URL_SITES + "/cm_thumbnailed");
 		Response response = sendRequest(req, 200);
 		JSONObject result = new JSONObject(response.getContentAsString());
-		assertEquals(10, result.length());
+		assertEquals(11, result.length());
 		assertEquals(200,response.getStatus());
 		validateAspectClass(result);
 		req = new GetRequest(URL_SITES + "/cm_cmobject");
 		response = sendRequest(req, 200);
 		result = new JSONObject(response.getContentAsString());
-		assertEquals(10, result.length());
+		assertEquals(11, result.length());
 		assertEquals(200,response.getStatus());
 		validateTypeClass(result);
 		
@@ -384,7 +384,7 @@ public class DictionaryServiceTest extends BaseWebScriptTest
 		}
 		assertEquals(200,response.getStatus());
 		
-		//check for a type under cm without options=>name, namespaceprefix [case-type:2]
+		/*//check for a type under cm without options=>name, namespaceprefix [case-type:2]
 		arguments.clear();
 		arguments.put("cf", "type");
 		arguments.put("nsp", "cm");
@@ -651,7 +651,7 @@ public class DictionaryServiceTest extends BaseWebScriptTest
 		arguments.clear();
 		req.setArgs(arguments);
 		response = sendRequest(req, 200);
-		assertEquals(200,response.getStatus());
+		assertEquals(200,response.getStatus());*/
 	}
 	
 	public void testSubClassDetails() throws Exception
diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetail.java b/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetail.java
index 8696988aa0..77bf3ca0ff 100644
--- a/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetail.java
+++ b/source/java/org/alfresco/repo/web/scripts/dictionary/GetClassDetail.java
@@ -147,20 +147,20 @@ public class GetClassDetail extends DeclarativeWebScript
 		             {
 		                 name = qnameObj.getLocalName();
 		                 myModel = QName.createQName(this.dictionaryhelper.getFullNamespaceURI(namespaceprefix + "_" + name));
-		                 
-		                 // check the classfilter to pull out either all or tyype or aspects
+		                 qnames.clear();
+		                 // check the classfilter to pull out either all or type or aspects
 		                 if (classfilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE1)) 
 		                 {
-		             		qnames = this.dictionaryservice.getAspects(myModel);
+		             		qnames.addAll(this.dictionaryservice.getAspects(myModel));
 		             		qnames.addAll(this.dictionaryservice.getTypes(myModel));
 		             	 }
 		                 else if (classfilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE3))
 		             	 {
-		             		qnames = this.dictionaryservice.getTypes(myModel);
+		             		qnames.addAll(this.dictionaryservice.getTypes(myModel));
 		             	 }
 		             	else if (classfilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE2))
 		               	{
-		               		qnames = this.dictionaryservice.getAspects(myModel);
+		             		qnames.addAll(this.dictionaryservice.getAspects(myModel));
 		               	}
 		             }
 		        }