diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml
index 0e3780b834..23ff8df578 100644
--- a/config/alfresco/model/applicationModel.xml
+++ b/config/alfresco/model/applicationModel.xml
@@ -62,17 +62,6 @@
             </property>
          </properties>
          <associations>
-            <child-association name="app:formtriples">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>app:formtriple</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
             <child-association name="app:webuser">
                <source>
                   <mandatory>false</mandatory>
@@ -84,27 +73,31 @@
                   <many>true</many>
                </target>
             </child-association>
+            <child-association name="app:webform">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>app:webform</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
+            <child-association name="app:webworkflowdefaults">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>app:webworkflowdefaults</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
          </associations>
       </type>
       
-      <type name="app:formtriple">
-         <title>Website Form Triple</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="app:form">
-               <type>d:noderef</type>
-               <mandatory>true</mandatory>
-            </property>
-            <property name="app:workflow">
-               <type>d:noderef</type>
-               <mandatory>true</mandatory>
-            </property>
-            <property name="app:script">
-               <type>d:noderef</type>
-            </property>
-         </properties>
-      </type>
-      
       <type name="app:webuser">
          <title>Website User Information</title>
          <parent>sys:base</parent>
@@ -119,6 +112,83 @@
             </property>
          </properties>
       </type>
+      
+      <type name="app:webform">
+         <title>Website Web Form</title>
+         <parent>sys:base</parent>
+         <properties>
+            <property name="app:formname">
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+         </properties>
+         <associations>
+            <child-association name="app:webformtemplate">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>app:webformtemplate</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
+            <child-association name="app:workflowdefaults">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>app:workflowdefaults</class>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </target>
+            </child-association>
+         </associations>
+         <mandatory-aspects>
+				<aspect>cm:titled</aspect>
+				<aspect>app:filenamepattern</aspect>
+			</mandatory-aspects>
+      </type>
+      
+      <type name="app:webformtemplate">
+         <title>Website Web Form Template</title>
+         <parent>sys:base</parent>
+			<properties>
+            <property name="app:engine">
+               <type>d:noderef</type>
+               <mandatory>true</mandatory>
+            </property>
+         </properties>
+         <mandatory-aspects>
+				<aspect>app:filenamepattern</aspect>
+			</mandatory-aspects>
+      </type>
+      
+      <type name="app:workflowdefaults">
+         <title>Workflow Defaults</title>
+         <parent>sys:base</parent>
+			<properties>
+            <property name="app:workflowname">
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="app:defaults">
+               <type>d:content</type>
+               <mandatory>false</mandatory>
+               <index enabled="false" />
+            </property>
+         </properties>
+      </type>
+      
+      <type name="app:webworkflowdefaults">
+         <title>Web Workflow Defaults</title>
+         <parent>app:workflowdefaults</parent>
+         <mandatory-aspects>
+				<aspect>app:filenamepattern</aspect>
+			</mandatory-aspects>
+      </type>
 
 	</types>
 
@@ -204,6 +274,15 @@
             </property>
          </properties>
       </aspect>
+      
+      <aspect name="app:filenamepattern">
+         <title>Filename Pattern</title>
+         <properties>
+            <property name="app:filenamepattern">
+               <type>d:text</type>
+            </property>
+         </properties>
+      </aspect>
 
 	</aspects>
 	
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index e74aaf3652..271b8249dd 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -236,10 +236,36 @@ public interface ContentModel
     static final QName TYPE_AVMWEBFOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webfolder");
     static final QName PROP_AVMSTORE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "avmstore");
     static final QName ASSOC_WEBUSER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webuser");
+    static final QName ASSOC_WEBFORM = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webform");
+    static final QName ASSOC_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults");
+    
+    // AVM web user reference
     static final QName TYPE_WEBUSER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webuser");
     static final QName PROP_WEBUSERNAME = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "username");
     static final QName PROP_WEBUSERROLE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "role");
     
+    // AVM web form
+    static final QName TYPE_WEBFORM = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webform");
+    static final QName PROP_FORMNAME = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "formname");
+    static final QName ASSOC_WEBFORMTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webformtemplate");
+    static final QName ASSOC_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowdefaults");
+    
+    // AVM web form template
+    static final QName TYPE_WEBFORMTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webformtemplate");
+    static final QName PROP_ENGINE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "engine");
+    
+    // AVM workflow defaults
+    static final QName TYPE_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowdefaults");
+    static final QName PROP_WORKFLOWNAME = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "workflowname");
+    static final QName PROP_WORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "defaults");
+    
+    // AVM web workflow defaults
+    static final QName TYPE_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults");
+    
+    // AVM filename pattern aspect
+    static final QName ASPECT_FILENAMEPATTERN = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "filenamepattern");
+    static final QName PROP_FILENAMEPATTERN = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "filenamepattern");
+    
     
     //
     // User Model Definitions