diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml
index 24630744a6..0b85a80a5a 100644
--- a/config/alfresco/model/applicationModel.xml
+++ b/config/alfresco/model/applicationModel.xml
@@ -7,6 +7,7 @@
 
    <imports>
       <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
       <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
    </imports>
    
@@ -58,11 +59,6 @@
             <property name="app:avmstore">
                <type>d:text</type>
             </property>
-            <!-- list of usernames who have sandboxes in this website -->
-            <property name="app:usersandboxes">
-               <type>d:text</type>
-               <multiple>true</multiple>
-            </property>
          </properties>
          <associations>
             <child-association name="app:formtriples">
@@ -92,7 +88,7 @@
       
       <type name="app:formtriple">
          <title>Website Form Triple</title>
-         <parent>cm:cmobject</parent>
+         <parent>sys:base</parent>
          <properties>
             <property name="app:form">
                <type>d:noderef</type>
@@ -110,7 +106,7 @@
       
       <type name="app:webuser">
          <title>Website User Information</title>
-         <parent>cm:cmobject</parent>
+         <parent>sys:base</parent>
          <properties>
             <property name="app:username">
                <type>d:text</type>
diff --git a/config/alfresco/model/permissionDefinitions.xml b/config/alfresco/model/permissionDefinitions.xml
index 85d907b5c3..10a224a95a 100644
--- a/config/alfresco/model/permissionDefinitions.xml
+++ b/config/alfresco/model/permissionDefinitions.xml
@@ -19,6 +19,7 @@
    <namespaces>
       <namespace uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
       <namespace uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+      <namespace uri="http://www.alfresco.org/model/application/1.0" prefix="app"/>
    </namespaces>
 
    <!--                                                                                   -->
@@ -302,6 +303,31 @@
       
    </permissionSet>
    
+   <!-- ========================================== -->
+   <!-- Permissions specific to avm website folder -->
+   <!-- ========================================== -->
+   
+   <permissionSet type="app:webfolder" expose="selected">
+
+      <!-- AVM website specific roles.                                                   -->
+      <permissionGroup name="ContentManager" allowFullControl="true" expose="true">
+         <includePermissionGroup permissionGroup="Contributor" type="cm:cmobject" />
+      </permissionGroup>
+      
+      <permissionGroup name="ContentPublisher" allowFullControl="false" expose="true">
+         <includePermissionGroup permissionGroup="Collaborator" type="cm:cmobject" />
+      </permissionGroup>
+      
+      <permissionGroup name="ContentContributor" allowFullControl="false" expose="true">
+         <includePermissionGroup permissionGroup="Contributor" type="cm:cmobject" />
+      </permissionGroup>
+      
+      <permissionGroup name="ContentReviewer" allowFullControl="false" expose="true">
+         <includePermissionGroup permissionGroup="Consumer" type="cm:cmobject" />
+      </permissionGroup>
+      
+   </permissionSet>
+   
    <!-- ============================================== -->
    <!-- Permissions associated with the Ownable aspect -->
    <!-- ============================================== -->
@@ -323,7 +349,6 @@
       
    </permissionSet>
    
-   
    <!-- =================================================== -->
    <!-- Permission related to lock, check out and check in. -->
    <!-- =================================================== -->
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index 1fa380b981..2569f30682 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -239,7 +239,10 @@ public interface ContentModel
     // AVM web folder
     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 PROP_USERSANDBOXES = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "usersandboxes");
+    static final QName ASSOC_WEBUSER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webuser");
+    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");
     
     
     //