diff --git a/config/alfresco/model/wcmModel.xml b/config/alfresco/model/wcmModel.xml
index 5e99c9858c..2b95d6cf15 100644
--- a/config/alfresco/model/wcmModel.xml
+++ b/config/alfresco/model/wcmModel.xml
@@ -8,6 +8,7 @@
    <imports>
       <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
       <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
    </imports>
 
    <namespaces>
@@ -60,6 +61,23 @@
              </property>
           </properties>
       </type>
+
+      <type name="wcm:renditionproperties">
+         <title>Properties for renditions</title>
+	 <parent>sys:base</parent>
+         <properties>
+            <property name="wcm:outputpathpatternforrendition">
+               <title>Type</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="wcm:mimetypeforrendition">
+               <title>Mimetype for generated assets</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+         </properties>
+      </type>
    </types>
    
    <aspects>
@@ -68,14 +86,24 @@
       <aspect name="wcm:form">
          <title>XForms Form</title>
          <properties>
-            <property name="wcm:schemarootelementname">
+            <property name="wcm:xmlschemarootelementname">
                <title>Schema Root Element Name</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
             </property>
+            <property name="wcm:xmlschema">
+               <title>Schema</title>
+               <type>d:noderef</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="wcm:outputpathpatternforforminstancedata">
+               <title>Type</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
          </properties>
          <associations>
-            <association name="wcm:renderingengines">
+            <association name="wcm:renderingenginetemplates">
                <title>Form Data Renderers</title>
                <source>
                   <role>wcm:capture</role>
@@ -83,7 +111,7 @@
                   <many>false</many>
                </source>
                <target>
-                  <class>wcm:renderingengine</class>
+                  <class>wcm:renderingenginetemplate</class>
                   <role>wcm:presentation</role>
                   <mandatory>false</mandatory>
                   <many>true</many>
@@ -93,30 +121,35 @@
       </aspect>
       
       <!-- An XML to something else transformer. -->
-      <aspect name="wcm:renderingengine">
+      <aspect name="wcm:renderingenginetemplate">
          <title>A Rendering Engine</title>
          <properties>
-            <property name="wcm:rendereringenginetype">
+            <property name="wcm:parentrendereringenginename">
                <title>Type</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="wcm:fileextensionforrendition">
-               <title>File extension for generated assets</title>
-               <type>d:text</type>
-               <mandatory>true</mandatory>
-            </property>
-            <property name="wcm:mimetypeforrendition">
-               <title>Mimetype for generated assets</title>
-               <type>d:text</type>
-               <mandatory>true</mandatory>
-            </property>
             <property name="wcm:formsource">
                <title>Form Source</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
             </property>
          </properties>
+         <associations>
+            <child-association name="wcm:renditionproperties">
+               <title>Rendition Properties</title>
+               <source>
+                  <role>wcm:capture</role>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>wcm:renditionproperties</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+              </target>
+            </child-association>
+         </associations>
       </aspect>
 
       <aspect name="wcm:forminstancedata">
@@ -129,7 +162,7 @@
             </property>
             <property name="wcm:parentformname">
                <title>Form that generated this asset</title>
-               <type>d:noderef</type>
+               <type>d:text</type>
                <mandatory>true</mandatory>
             </property>
          </properties>
@@ -138,7 +171,7 @@
       <aspect name="wcm:rendition">
          <title>XML file generated by a form</title>
          <properties>
-            <property name="wcm:parentrenderingengine">
+            <property name="wcm:parentrenderingenginetemplate">
                <title>Form data renderer that generated this asset</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
diff --git a/source/java/org/alfresco/model/WCMModel.java b/source/java/org/alfresco/model/WCMModel.java
index a8ece96ee1..6561dee927 100644
--- a/source/java/org/alfresco/model/WCMModel.java
+++ b/source/java/org/alfresco/model/WCMModel.java
@@ -39,21 +39,26 @@ public interface WCMModel
     
     // The XForms data capture form aspect.
     public static final QName ASPECT_FORM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "form");
-    public static final QName PROP_SCHEMA_ROOT_ELEMENT_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "schemarootelementname");
-    public static final QName ASSOC_RENDERING_ENGINES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingengines");
+    public static final QName PROP_XML_SCHEMA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "schema");
+    public static final QName PROP_XML_SCHEMA_ROOT_ELEMENT_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "xmlschemarootelementname");
+    public static final QName PROP_OUTPUT_PATH_PATTERN_FOR_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "outputpathpatternforforminstancedata");
+    public static final QName ASSOC_RENDERING_ENGINE_TEMPLATES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingenginetemplates");
     
     // An XML to something else tranformer aspect.
-    public static final QName ASPECT_RENDERING_ENGINE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingengine");
-    public static final QName PROP_RENDERING_ENGINE_TYPE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingenginetype");
-    public static final QName PROP_FILE_EXTENSION_FOR_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "fileextensionforrendition");
-    public static final QName PROP_MIMETYPE_FOR_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "mimetypeforrendition");
+    public static final QName ASPECT_RENDERING_ENGINE_TEMPLATE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingenginetemplate");
+    public static final QName PROP_PARENT_RENDERING_ENGINE_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentrenderingenginename");
     public static final QName PROP_FORM_SOURCE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formsource");
+    public static final QName ASSOC_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renditionproperties");
 
     public static final QName ASPECT_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "forminstancedata");
     public static final QName PROP_PARENT_FORM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentform");
     public static final QName PROP_PARENT_FORM_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentformname");
 
     public static final QName ASPECT_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "rendition");
-    public static final QName PROP_PARENT_RENDERING_ENGINE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentrenderingengine");
+    public static final QName PROP_PARENT_RENDERING_ENGINE_TEMPLATE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentrenderingenginetemplate");
     public static final QName PROP_PRIMARY_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "primaryforminstancedata");
+
+    public static final QName TYPE_RENDITION_PROPERTIES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renditionproperties");
+    public static final QName PROP_OUTPUT_PATH_PATTERN_FOR_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "outputpathpatternforrendition");
+    public static final QName PROP_MIMETYPE_FOR_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "mimetypeforrendition");
 }