--- data-upgraded.xml	2014-06-20 15:40:00.000000000 +0200
+++ data-fresh.xml	2014-06-20 15:17:42.000000000 +0200
@@ -55,11 +55,15 @@
             </sv:property>
             </sv:node>
           <sv:node sv:name="availability">
-            <sv:property sv:name="ruleClass" sv:type="String">
+            <sv:node sv:name="rules">
+              <sv:node sv:name="IsNotDeletedRule">
+                <sv:property sv:name="implementationClass" sv:type="String">
               <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
             </sv:property>
           </sv:node>
         </sv:node>
+          </sv:node>
+        </sv:node>
         <sv:node sv:name="showVersions">
           <sv:property sv:name="appName" sv:type="String">
             <sv:value>companyApp</sv:value>
@@ -91,11 +95,15 @@
             </sv:property>
             </sv:node>
           <sv:node sv:name="availability">
-            <sv:property sv:name="ruleClass" sv:type="String">
+            <sv:node sv:name="rules">
+              <sv:node sv:name="HasVersionsRule">
+                <sv:property sv:name="implementationClass" sv:type="String">
               <sv:value>info.magnolia.ui.framework.availability.HasVersionsRule</sv:value>
             </sv:property>
           </sv:node>
         </sv:node>
+          </sv:node>
+        </sv:node>
         <sv:node sv:name="activate">
           <sv:property sv:name="catalog" sv:type="String">
             <sv:value>versioned</sv:value>
@@ -184,8 +192,8 @@
             </sv:property>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -210,8 +218,8 @@
             </sv:property>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -261,8 +269,8 @@
             </sv:property>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -298,8 +306,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -335,8 +343,8 @@
               </sv:node>
         	<sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -372,8 +380,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -409,8 +417,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -446,8 +454,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -472,8 +480,8 @@
             </sv:property>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -523,8 +531,8 @@
             </sv:property>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -560,8 +568,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -597,8 +605,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -634,8 +642,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -671,8 +679,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -708,8 +716,8 @@
               </sv:node>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsNotDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsNotDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -731,8 +739,8 @@
             </sv:property>
             <sv:node sv:name="rules">
               <sv:node sv:name="HasVersionsRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.HasVersionsRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -760,8 +768,8 @@
             </sv:property>
             <sv:node sv:name="rules">
               <sv:node sv:name="IsDeletedRule">
-                <sv:property sv:name="class" sv:type="String">
-                  <sv:value>info.magnolia.ui.api.availability.ConfiguredAvailabilityRuleDefinition</sv:value>
+                <sv:property sv:name="implementationClass" sv:type="String">
+                  <sv:value>info.magnolia.ui.framework.availability.IsDeletedRule</sv:value>
                 </sv:property>
                 </sv:node>
             </sv:node>
@@ -779,7 +787,7 @@
             </sv:property>
             <sv:node sv:name="availability">
               <sv:property sv:name="multiple" sv:type="Boolean">
-                <sv:value>true</sv:value>
+                <sv:value>false</sv:value>
               </sv:property>
               <sv:property sv:name="nodes" sv:type="Boolean">
                 <sv:value>false</sv:value>
@@ -811,7 +819,7 @@
             </sv:property>
             <sv:node sv:name="availability">
               <sv:property sv:name="multiple" sv:type="Boolean">
-                <sv:value>true</sv:value>
+                <sv:value>false</sv:value>
               </sv:property>
               <sv:property sv:name="nodes" sv:type="Boolean">
                 <sv:value>true</sv:value>
@@ -872,7 +880,7 @@
             </sv:property>
             <sv:node sv:name="availability">
               <sv:property sv:name="multiple" sv:type="Boolean">
-                <sv:value>true</sv:value>
+                <sv:value>false</sv:value>
               </sv:property>
               <sv:property sv:name="nodes" sv:type="Boolean">
                 <sv:value>true</sv:value>
@@ -933,7 +941,7 @@
             </sv:property>
             <sv:node sv:name="availability">
               <sv:property sv:name="multiple" sv:type="Boolean">
-                <sv:value>true</sv:value>
+                <sv:value>false</sv:value>
               </sv:property>
               <sv:property sv:name="nodes" sv:type="Boolean">
                 <sv:value>true</sv:value>
@@ -994,7 +1002,7 @@
             </sv:property>
             <sv:node sv:name="availability">
               <sv:property sv:name="multiple" sv:type="Boolean">
-                <sv:value>true</sv:value>
+                <sv:value>false</sv:value>
               </sv:property>
               <sv:property sv:name="nodes" sv:type="Boolean">
                 <sv:value>true</sv:value>
@@ -1055,7 +1063,7 @@
             </sv:property>
             <sv:node sv:name="availability">
               <sv:property sv:name="multiple" sv:type="Boolean">
-                <sv:value>true</sv:value>
+                <sv:value>false</sv:value>
               </sv:property>
               <sv:property sv:name="nodes" sv:type="Boolean">
                 <sv:value>true</sv:value>
@@ -1122,7 +1130,7 @@
             </sv:property>
             <sv:node sv:name="availability">
               <sv:property sv:name="multiple" sv:type="Boolean">
-                <sv:value>true</sv:value>
+                <sv:value>false</sv:value>
               </sv:property>
               <sv:property sv:name="nodes" sv:type="Boolean">
                 <sv:value>true</sv:value>
@@ -1380,9 +1388,6 @@
         <sv:value>info.magnolia.ui.contentapp.detail.DetailSubApp</sv:value>
       </sv:property>
       <sv:node sv:name="editor">
-        <sv:property sv:name="workspace" sv:type="String">
-          <sv:value>data</sv:value>
-        </sv:property>
         <sv:node sv:name="nodeType">
           <sv:property sv:name="name" sv:type="String">
             <sv:value>company</sv:value>
@@ -1421,6 +1426,14 @@
           </sv:property>
           </sv:node>
       </sv:node>
+      <sv:node sv:name="contentConnector">
+        <sv:property sv:name="rootPath" sv:type="String">
+          <sv:value>/company</sv:value>
+        </sv:property>
+        <sv:property sv:name="workspace" sv:type="String">
+          <sv:value>data</sv:value>
+        </sv:property>
+      </sv:node>
     </sv:node>
     <sv:node sv:name="department">
       <sv:property sv:name="class" sv:type="String">
@@ -1430,9 +1443,6 @@
         <sv:value>info.magnolia.ui.contentapp.detail.DetailSubApp</sv:value>
       </sv:property>
       <sv:node sv:name="editor">
-        <sv:property sv:name="workspace" sv:type="String">
-          <sv:value>data</sv:value>
-        </sv:property>
         <sv:node sv:name="nodeType">
           <sv:property sv:name="name" sv:type="String">
             <sv:value>department</sv:value>
@@ -1471,6 +1481,14 @@
           </sv:property>
           </sv:node>
       </sv:node>
+      <sv:node sv:name="contentConnector">
+        <sv:property sv:name="rootPath" sv:type="String">
+          <sv:value>/company</sv:value>
+        </sv:property>
+        <sv:property sv:name="workspace" sv:type="String">
+          <sv:value>data</sv:value>
+        </sv:property>
+      </sv:node>
     </sv:node>
     <sv:node sv:name="employees">
       <sv:property sv:name="class" sv:type="String">
@@ -1480,9 +1498,6 @@
         <sv:value>info.magnolia.ui.contentapp.detail.DetailSubApp</sv:value>
       </sv:property>
       <sv:node sv:name="editor">
-        <sv:property sv:name="workspace" sv:type="String">
-          <sv:value>data</sv:value>
-        </sv:property>
         <sv:node sv:name="nodeType">
           <sv:property sv:name="name" sv:type="String">
             <sv:value>employees</sv:value>
@@ -1521,6 +1536,14 @@
           </sv:property>
           </sv:node>
       </sv:node>
+      <sv:node sv:name="contentConnector">
+        <sv:property sv:name="rootPath" sv:type="String">
+          <sv:value>/company</sv:value>
+        </sv:property>
+        <sv:property sv:name="workspace" sv:type="String">
+          <sv:value>data</sv:value>
+        </sv:property>
+      </sv:node>
     </sv:node>
     <sv:node sv:name="director">
       <sv:property sv:name="class" sv:type="String">
@@ -1530,9 +1553,6 @@
         <sv:value>info.magnolia.ui.contentapp.detail.DetailSubApp</sv:value>
       </sv:property>
       <sv:node sv:name="editor">
-        <sv:property sv:name="workspace" sv:type="String">
-          <sv:value>data</sv:value>
-        </sv:property>
         <sv:node sv:name="nodeType">
           <sv:property sv:name="name" sv:type="String">
             <sv:value>director</sv:value>
@@ -1571,6 +1591,14 @@
           </sv:property>
           </sv:node>
       </sv:node>
+      <sv:node sv:name="contentConnector">
+        <sv:property sv:name="rootPath" sv:type="String">
+          <sv:value>/company</sv:value>
+        </sv:property>
+        <sv:property sv:name="workspace" sv:type="String">
+          <sv:value>data</sv:value>
+        </sv:property>
+      </sv:node>
     </sv:node>
     <sv:node sv:name="manager">
       <sv:property sv:name="class" sv:type="String">
@@ -1580,9 +1608,6 @@
         <sv:value>info.magnolia.ui.contentapp.detail.DetailSubApp</sv:value>
       </sv:property>
       <sv:node sv:name="editor">
-        <sv:property sv:name="workspace" sv:type="String">
-          <sv:value>data</sv:value>
-        </sv:property>
         <sv:node sv:name="nodeType">
           <sv:property sv:name="name" sv:type="String">
             <sv:value>manager</sv:value>
@@ -1621,6 +1646,14 @@
           </sv:property>
           </sv:node>
       </sv:node>
+      <sv:node sv:name="contentConnector">
+        <sv:property sv:name="rootPath" sv:type="String">
+          <sv:value>/company</sv:value>
+        </sv:property>
+        <sv:property sv:name="workspace" sv:type="String">
+          <sv:value>data</sv:value>
+        </sv:property>
+      </sv:node>
     </sv:node>
     <sv:node sv:name="developer">
       <sv:property sv:name="class" sv:type="String">
@@ -1630,9 +1663,6 @@
         <sv:value>info.magnolia.ui.contentapp.detail.DetailSubApp</sv:value>
       </sv:property>
       <sv:node sv:name="editor">
-        <sv:property sv:name="workspace" sv:type="String">
-          <sv:value>data</sv:value>
-        </sv:property>
         <sv:node sv:name="nodeType">
           <sv:property sv:name="name" sv:type="String">
             <sv:value>developer</sv:value>
@@ -1671,6 +1701,14 @@
           </sv:property>
           </sv:node>
       </sv:node>
+      <sv:node sv:name="contentConnector">
+        <sv:property sv:name="rootPath" sv:type="String">
+          <sv:value>/company</sv:value>
+        </sv:property>
+        <sv:property sv:name="workspace" sv:type="String">
+          <sv:value>data</sv:value>
+        </sv:property>
+      </sv:node>
     </sv:node>
   </sv:node>
 </sv:node>