diff --git a/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd
index 542b6e1a27..1c792f94ac 100644
--- a/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd
@@ -72,14 +72,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -240,14 +232,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
diff --git a/source/generated/org/alfresco/repo/webservice/action/Action.java b/source/generated/org/alfresco/repo/webservice/action/Action.java
index 91a63193b4..8599aee28d 100644
--- a/source/generated/org/alfresco/repo/webservice/action/Action.java
+++ b/source/generated/org/alfresco/repo/webservice/action/Action.java
@@ -8,6 +8,8 @@
 package org.alfresco.repo.webservice.action;
 
 public class Action  implements java.io.Serializable {
+    private org.alfresco.repo.webservice.types.Reference actionReference;
+
     private java.lang.String id;
 
     private java.lang.String actionName;
@@ -16,8 +18,6 @@ public class Action  implements java.io.Serializable {
 
     private java.lang.String description;
 
-    private boolean executeAsynchronously;
-
     private org.alfresco.repo.webservice.types.NamedValue[] parameters;
 
     private org.alfresco.repo.webservice.action.Condition[] conditions;
@@ -26,32 +26,48 @@ public class Action  implements java.io.Serializable {
 
     private org.alfresco.repo.webservice.action.Action[] actions;
 
-    private org.alfresco.repo.webservice.types.Reference reference;
-
     public Action() {
     }
 
     public Action(
+           org.alfresco.repo.webservice.types.Reference actionReference,
            java.lang.String id,
            java.lang.String actionName,
            java.lang.String title,
            java.lang.String description,
-           boolean executeAsynchronously,
            org.alfresco.repo.webservice.types.NamedValue[] parameters,
            org.alfresco.repo.webservice.action.Condition[] conditions,
            org.alfresco.repo.webservice.action.Action compensatingAction,
-           org.alfresco.repo.webservice.action.Action[] actions,
-           org.alfresco.repo.webservice.types.Reference reference) {
+           org.alfresco.repo.webservice.action.Action[] actions) {
+           this.actionReference = actionReference;
            this.id = id;
            this.actionName = actionName;
            this.title = title;
            this.description = description;
-           this.executeAsynchronously = executeAsynchronously;
            this.parameters = parameters;
            this.conditions = conditions;
            this.compensatingAction = compensatingAction;
            this.actions = actions;
-           this.reference = reference;
+    }
+
+
+    /**
+     * Gets the actionReference value for this Action.
+     * 
+     * @return actionReference
+     */
+    public org.alfresco.repo.webservice.types.Reference getActionReference() {
+        return actionReference;
+    }
+
+
+    /**
+     * Sets the actionReference value for this Action.
+     * 
+     * @param actionReference
+     */
+    public void setActionReference(org.alfresco.repo.webservice.types.Reference actionReference) {
+        this.actionReference = actionReference;
     }
 
 
@@ -135,26 +151,6 @@ public class Action  implements java.io.Serializable {
     }
 
 
-    /**
-     * Gets the executeAsynchronously value for this Action.
-     * 
-     * @return executeAsynchronously
-     */
-    public boolean isExecuteAsynchronously() {
-        return executeAsynchronously;
-    }
-
-
-    /**
-     * Sets the executeAsynchronously value for this Action.
-     * 
-     * @param executeAsynchronously
-     */
-    public void setExecuteAsynchronously(boolean executeAsynchronously) {
-        this.executeAsynchronously = executeAsynchronously;
-    }
-
-
     /**
      * Gets the parameters value for this Action.
      * 
@@ -258,26 +254,6 @@ public class Action  implements java.io.Serializable {
         this.actions[i] = _value;
     }
 
-
-    /**
-     * Gets the reference value for this Action.
-     * 
-     * @return reference
-     */
-    public org.alfresco.repo.webservice.types.Reference getReference() {
-        return reference;
-    }
-
-
-    /**
-     * Sets the reference value for this Action.
-     * 
-     * @param reference
-     */
-    public void setReference(org.alfresco.repo.webservice.types.Reference reference) {
-        this.reference = reference;
-    }
-
     private java.lang.Object __equalsCalc = null;
     public synchronized boolean equals(java.lang.Object obj) {
         if (!(obj instanceof Action)) return false;
@@ -290,6 +266,9 @@ public class Action  implements java.io.Serializable {
         __equalsCalc = obj;
         boolean _equals;
         _equals = true && 
+            ((this.actionReference==null && other.getActionReference()==null) || 
+             (this.actionReference!=null &&
+              this.actionReference.equals(other.getActionReference()))) &&
             ((this.id==null && other.getId()==null) || 
              (this.id!=null &&
               this.id.equals(other.getId()))) &&
@@ -302,7 +281,6 @@ public class Action  implements java.io.Serializable {
             ((this.description==null && other.getDescription()==null) || 
              (this.description!=null &&
               this.description.equals(other.getDescription()))) &&
-            this.executeAsynchronously == other.isExecuteAsynchronously() &&
             ((this.parameters==null && other.getParameters()==null) || 
              (this.parameters!=null &&
               java.util.Arrays.equals(this.parameters, other.getParameters()))) &&
@@ -314,10 +292,7 @@ public class Action  implements java.io.Serializable {
               this.compensatingAction.equals(other.getCompensatingAction()))) &&
             ((this.actions==null && other.getActions()==null) || 
              (this.actions!=null &&
-              java.util.Arrays.equals(this.actions, other.getActions()))) &&
-            ((this.reference==null && other.getReference()==null) || 
-             (this.reference!=null &&
-              this.reference.equals(other.getReference())));
+              java.util.Arrays.equals(this.actions, other.getActions())));
         __equalsCalc = null;
         return _equals;
     }
@@ -329,6 +304,9 @@ public class Action  implements java.io.Serializable {
         }
         __hashCodeCalc = true;
         int _hashCode = 1;
+        if (getActionReference() != null) {
+            _hashCode += getActionReference().hashCode();
+        }
         if (getId() != null) {
             _hashCode += getId().hashCode();
         }
@@ -341,7 +319,6 @@ public class Action  implements java.io.Serializable {
         if (getDescription() != null) {
             _hashCode += getDescription().hashCode();
         }
-        _hashCode += (isExecuteAsynchronously() ? Boolean.TRUE : Boolean.FALSE).hashCode();
         if (getParameters() != null) {
             for (int i=0;
                  i<java.lang.reflect.Array.getLength(getParameters());
@@ -378,9 +355,6 @@ public class Action  implements java.io.Serializable {
                 }
             }
         }
-        if (getReference() != null) {
-            _hashCode += getReference().hashCode();
-        }
         __hashCodeCalc = false;
         return _hashCode;
     }
@@ -392,6 +366,12 @@ public class Action  implements java.io.Serializable {
     static {
         typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Action"));
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("actionReference");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "actionReference"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
@@ -416,12 +396,6 @@ public class Action  implements java.io.Serializable {
         elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("executeAsynchronously");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "executeAsynchronously"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
-        elemField.setNillable(false);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("parameters");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "parameters"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "NamedValue"));
@@ -451,12 +425,6 @@ public class Action  implements java.io.Serializable {
         elemField.setNillable(true);
         elemField.setMaxOccursUnbounded(true);
         typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("reference");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "reference"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
-        elemField.setNillable(true);
-        typeDesc.addFieldDesc(elemField);
     }
 
     /**
diff --git a/source/generated/org/alfresco/repo/webservice/action/Rule.java b/source/generated/org/alfresco/repo/webservice/action/Rule.java
index a4b76c5052..bfdbf54843 100644
--- a/source/generated/org/alfresco/repo/webservice/action/Rule.java
+++ b/source/generated/org/alfresco/repo/webservice/action/Rule.java
@@ -8,9 +8,11 @@
 package org.alfresco.repo.webservice.action;
 
 public class Rule  implements java.io.Serializable {
-    private java.lang.String id;
+    private org.alfresco.repo.webservice.types.Reference ruleReference;
 
-    private java.lang.String ruleType;
+    private org.alfresco.repo.webservice.types.Reference owningReference;
+
+    private java.lang.String[] ruleTypes;
 
     private java.lang.String title;
 
@@ -18,76 +20,94 @@ public class Rule  implements java.io.Serializable {
 
     private boolean executeAsynchronously;
 
-    private org.alfresco.repo.webservice.action.Condition[] conditions;
-
-    private org.alfresco.repo.webservice.action.Action[] actions;
-
-    private java.lang.String runAsUserName;
-
-    private org.alfresco.repo.webservice.types.Reference reference;
+    private org.alfresco.repo.webservice.action.Action action;
 
     public Rule() {
     }
 
     public Rule(
-           java.lang.String id,
-           java.lang.String ruleType,
+           org.alfresco.repo.webservice.types.Reference ruleReference,
+           org.alfresco.repo.webservice.types.Reference owningReference,
+           java.lang.String[] ruleTypes,
            java.lang.String title,
            java.lang.String description,
            boolean executeAsynchronously,
-           org.alfresco.repo.webservice.action.Condition[] conditions,
-           org.alfresco.repo.webservice.action.Action[] actions,
-           java.lang.String runAsUserName,
-           org.alfresco.repo.webservice.types.Reference reference) {
-           this.id = id;
-           this.ruleType = ruleType;
+           org.alfresco.repo.webservice.action.Action action) {
+           this.ruleReference = ruleReference;
+           this.owningReference = owningReference;
+           this.ruleTypes = ruleTypes;
            this.title = title;
            this.description = description;
            this.executeAsynchronously = executeAsynchronously;
-           this.conditions = conditions;
-           this.actions = actions;
-           this.runAsUserName = runAsUserName;
-           this.reference = reference;
+           this.action = action;
     }
 
 
     /**
-     * Gets the id value for this Rule.
+     * Gets the ruleReference value for this Rule.
      * 
-     * @return id
+     * @return ruleReference
      */
-    public java.lang.String getId() {
-        return id;
+    public org.alfresco.repo.webservice.types.Reference getRuleReference() {
+        return ruleReference;
     }
 
 
     /**
-     * Sets the id value for this Rule.
+     * Sets the ruleReference value for this Rule.
      * 
-     * @param id
+     * @param ruleReference
      */
-    public void setId(java.lang.String id) {
-        this.id = id;
+    public void setRuleReference(org.alfresco.repo.webservice.types.Reference ruleReference) {
+        this.ruleReference = ruleReference;
     }
 
 
     /**
-     * Gets the ruleType value for this Rule.
+     * Gets the owningReference value for this Rule.
      * 
-     * @return ruleType
+     * @return owningReference
      */
-    public java.lang.String getRuleType() {
-        return ruleType;
+    public org.alfresco.repo.webservice.types.Reference getOwningReference() {
+        return owningReference;
     }
 
 
     /**
-     * Sets the ruleType value for this Rule.
+     * Sets the owningReference value for this Rule.
      * 
-     * @param ruleType
+     * @param owningReference
      */
-    public void setRuleType(java.lang.String ruleType) {
-        this.ruleType = ruleType;
+    public void setOwningReference(org.alfresco.repo.webservice.types.Reference owningReference) {
+        this.owningReference = owningReference;
+    }
+
+
+    /**
+     * Gets the ruleTypes value for this Rule.
+     * 
+     * @return ruleTypes
+     */
+    public java.lang.String[] getRuleTypes() {
+        return ruleTypes;
+    }
+
+
+    /**
+     * Sets the ruleTypes value for this Rule.
+     * 
+     * @param ruleTypes
+     */
+    public void setRuleTypes(java.lang.String[] ruleTypes) {
+        this.ruleTypes = ruleTypes;
+    }
+
+    public java.lang.String getRuleTypes(int i) {
+        return this.ruleTypes[i];
+    }
+
+    public void setRuleTypes(int i, java.lang.String _value) {
+        this.ruleTypes[i] = _value;
     }
 
 
@@ -152,98 +172,22 @@ public class Rule  implements java.io.Serializable {
 
 
     /**
-     * Gets the conditions value for this Rule.
+     * Gets the action value for this Rule.
      * 
-     * @return conditions
+     * @return action
      */
-    public org.alfresco.repo.webservice.action.Condition[] getConditions() {
-        return conditions;
+    public org.alfresco.repo.webservice.action.Action getAction() {
+        return action;
     }
 
 
     /**
-     * Sets the conditions value for this Rule.
+     * Sets the action value for this Rule.
      * 
-     * @param conditions
+     * @param action
      */
-    public void setConditions(org.alfresco.repo.webservice.action.Condition[] conditions) {
-        this.conditions = conditions;
-    }
-
-    public org.alfresco.repo.webservice.action.Condition getConditions(int i) {
-        return this.conditions[i];
-    }
-
-    public void setConditions(int i, org.alfresco.repo.webservice.action.Condition _value) {
-        this.conditions[i] = _value;
-    }
-
-
-    /**
-     * Gets the actions value for this Rule.
-     * 
-     * @return actions
-     */
-    public org.alfresco.repo.webservice.action.Action[] getActions() {
-        return actions;
-    }
-
-
-    /**
-     * Sets the actions value for this Rule.
-     * 
-     * @param actions
-     */
-    public void setActions(org.alfresco.repo.webservice.action.Action[] actions) {
-        this.actions = actions;
-    }
-
-    public org.alfresco.repo.webservice.action.Action getActions(int i) {
-        return this.actions[i];
-    }
-
-    public void setActions(int i, org.alfresco.repo.webservice.action.Action _value) {
-        this.actions[i] = _value;
-    }
-
-
-    /**
-     * Gets the runAsUserName value for this Rule.
-     * 
-     * @return runAsUserName
-     */
-    public java.lang.String getRunAsUserName() {
-        return runAsUserName;
-    }
-
-
-    /**
-     * Sets the runAsUserName value for this Rule.
-     * 
-     * @param runAsUserName
-     */
-    public void setRunAsUserName(java.lang.String runAsUserName) {
-        this.runAsUserName = runAsUserName;
-    }
-
-
-    /**
-     * Gets the reference value for this Rule.
-     * 
-     * @return reference
-     */
-    public org.alfresco.repo.webservice.types.Reference getReference() {
-        return reference;
-    }
-
-
-    /**
-     * Sets the reference value for this Rule.
-     * 
-     * @param reference
-     */
-    public void setReference(org.alfresco.repo.webservice.types.Reference reference) {
-        this.reference = reference;
+    public void setAction(org.alfresco.repo.webservice.action.Action action) {
+        this.action = action;
     }
 
     private java.lang.Object __equalsCalc = null;
@@ -258,12 +202,15 @@ public class Rule  implements java.io.Serializable {
         __equalsCalc = obj;
         boolean _equals;
         _equals = true && 
-            ((this.id==null && other.getId()==null) || 
-             (this.id!=null &&
-              this.id.equals(other.getId()))) &&
-            ((this.ruleType==null && other.getRuleType()==null) || 
-             (this.ruleType!=null &&
-              this.ruleType.equals(other.getRuleType()))) &&
+            ((this.ruleReference==null && other.getRuleReference()==null) || 
+             (this.ruleReference!=null &&
+              this.ruleReference.equals(other.getRuleReference()))) &&
+            ((this.owningReference==null && other.getOwningReference()==null) || 
+             (this.owningReference!=null &&
+              this.owningReference.equals(other.getOwningReference()))) &&
+            ((this.ruleTypes==null && other.getRuleTypes()==null) || 
+             (this.ruleTypes!=null &&
+              java.util.Arrays.equals(this.ruleTypes, other.getRuleTypes()))) &&
             ((this.title==null && other.getTitle()==null) || 
              (this.title!=null &&
               this.title.equals(other.getTitle()))) &&
@@ -271,18 +218,9 @@ public class Rule  implements java.io.Serializable {
              (this.description!=null &&
               this.description.equals(other.getDescription()))) &&
             this.executeAsynchronously == other.isExecuteAsynchronously() &&
-            ((this.conditions==null && other.getConditions()==null) || 
-             (this.conditions!=null &&
-              java.util.Arrays.equals(this.conditions, other.getConditions()))) &&
-            ((this.actions==null && other.getActions()==null) || 
-             (this.actions!=null &&
-              java.util.Arrays.equals(this.actions, other.getActions()))) &&
-            ((this.runAsUserName==null && other.getRunAsUserName()==null) || 
-             (this.runAsUserName!=null &&
-              this.runAsUserName.equals(other.getRunAsUserName()))) &&
-            ((this.reference==null && other.getReference()==null) || 
-             (this.reference!=null &&
-              this.reference.equals(other.getReference())));
+            ((this.action==null && other.getAction()==null) || 
+             (this.action!=null &&
+              this.action.equals(other.getAction())));
         __equalsCalc = null;
         return _equals;
     }
@@ -294,11 +232,22 @@ public class Rule  implements java.io.Serializable {
         }
         __hashCodeCalc = true;
         int _hashCode = 1;
-        if (getId() != null) {
-            _hashCode += getId().hashCode();
+        if (getRuleReference() != null) {
+            _hashCode += getRuleReference().hashCode();
         }
-        if (getRuleType() != null) {
-            _hashCode += getRuleType().hashCode();
+        if (getOwningReference() != null) {
+            _hashCode += getOwningReference().hashCode();
+        }
+        if (getRuleTypes() != null) {
+            for (int i=0;
+                 i<java.lang.reflect.Array.getLength(getRuleTypes());
+                 i++) {
+                java.lang.Object obj = java.lang.reflect.Array.get(getRuleTypes(), i);
+                if (obj != null &&
+                    !obj.getClass().isArray()) {
+                    _hashCode += obj.hashCode();
+                }
+            }
         }
         if (getTitle() != null) {
             _hashCode += getTitle().hashCode();
@@ -307,33 +256,8 @@ public class Rule  implements java.io.Serializable {
             _hashCode += getDescription().hashCode();
         }
         _hashCode += (isExecuteAsynchronously() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        if (getConditions() != null) {
-            for (int i=0;
-                 i<java.lang.reflect.Array.getLength(getConditions());
-                 i++) {
-                java.lang.Object obj = java.lang.reflect.Array.get(getConditions(), i);
-                if (obj != null &&
-                    !obj.getClass().isArray()) {
-                    _hashCode += obj.hashCode();
-                }
-            }
-        }
-        if (getActions() != null) {
-            for (int i=0;
-                 i<java.lang.reflect.Array.getLength(getActions());
-                 i++) {
-                java.lang.Object obj = java.lang.reflect.Array.get(getActions(), i);
-                if (obj != null &&
-                    !obj.getClass().isArray()) {
-                    _hashCode += obj.hashCode();
-                }
-            }
-        }
-        if (getRunAsUserName() != null) {
-            _hashCode += getRunAsUserName().hashCode();
-        }
-        if (getReference() != null) {
-            _hashCode += getReference().hashCode();
+        if (getAction() != null) {
+            _hashCode += getAction().hashCode();
         }
         __hashCodeCalc = false;
         return _hashCode;
@@ -346,16 +270,23 @@ public class Rule  implements java.io.Serializable {
     static {
         typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Rule"));
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("id");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "id"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setFieldName("ruleReference");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "ruleReference"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
         elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("ruleType");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "ruleType"));
+        elemField.setFieldName("owningReference");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "owningReference"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("ruleTypes");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "ruleTypes"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setNillable(false);
+        elemField.setMaxOccursUnbounded(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("title");
@@ -376,31 +307,10 @@ public class Rule  implements java.io.Serializable {
         elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("conditions");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "conditions"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Condition"));
-        elemField.setMinOccurs(0);
-        elemField.setNillable(true);
-        elemField.setMaxOccursUnbounded(true);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("actions");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "actions"));
+        elemField.setFieldName("action");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "action"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Action"));
         elemField.setNillable(false);
-        elemField.setMaxOccursUnbounded(true);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("runAsUserName");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "runAsUserName"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(true);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("reference");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "reference"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
-        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd
index e56df19168..da100e530a 100644
--- a/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd
@@ -85,12 +85,20 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
+        qname="ns:Cardinality"
+        type="java:org.alfresco.repo.webservice.types.Cardinality"
         serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ClassDefinition"
+        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
         qname="ns:Rule"
@@ -117,8 +125,8 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Predicate"
-        type="java:org.alfresco.repo.webservice.types.Predicate"
+        qname="ns:Version"
+        type="java:org.alfresco.repo.webservice.types.Version"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
@@ -133,16 +141,56 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:NodeDefinition"
-        type="java:org.alfresco.repo.webservice.types.NodeDefinition"
+        qname="ns:Predicate"
+        type="java:org.alfresco.repo.webservice.types.Predicate"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ValueDefinition"
-        type="java:org.alfresco.repo.webservice.types.ValueDefinition"
+        qname="ns:ResultSetRow"
+        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Path"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSet"
+        type="java:org.alfresco.repo.webservice.types.ResultSet"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSetMetaData"
+        type="java:org.alfresco.repo.webservice.types.ResultSetMetaData"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
+        qname="ns:ActionItemDefinitionType"
+        type="java:org.alfresco.repo.webservice.action.ActionItemDefinitionType"
+        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:NodeDefinition"
+        type="java:org.alfresco.repo.webservice.types.NodeDefinition"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
@@ -155,6 +203,14 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ValueDefinition"
+        type="java:org.alfresco.repo.webservice.types.ValueDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
         qname="ns:ActionFault"
@@ -163,6 +219,38 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
+        qname="ns:RuleFilter"
+        type="java:org.alfresco.repo.webservice.action.RuleFilter"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
+        qname="ns:ActionItemDefinition"
+        type="java:org.alfresco.repo.webservice.action.ActionItemDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:>ContentFormat>mimetype"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Query"
+        type="java:org.alfresco.repo.webservice.types.Query"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -171,6 +259,14 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:UUID"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:NamedValue"
@@ -179,9 +275,17 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
+        qname="ns:Action"
+        type="java:org.alfresco.repo.webservice.action.Action"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:UUID"
+        qname="ns:Name"
         type="java:java.lang.String"
         serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
@@ -195,6 +299,22 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:>ContentFormat>encoding"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
+        qname="ns:RuleType"
+        type="java:org.alfresco.repo.webservice.action.RuleType"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Classification"
@@ -227,150 +347,6 @@
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:PropertyDefinition"
-        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ClassDefinition"
-        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Cardinality"
-        type="java:org.alfresco.repo.webservice.types.Cardinality"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Version"
-        type="java:org.alfresco.repo.webservice.types.Version"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Path"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSetRow"
-        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSet"
-        type="java:org.alfresco.repo.webservice.types.ResultSet"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSetMetaData"
-        type="java:org.alfresco.repo.webservice.types.ResultSetMetaData"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
-        qname="ns:ActionItemDefinitionType"
-        type="java:org.alfresco.repo.webservice.action.ActionItemDefinitionType"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
-        qname="ns:RuleFilter"
-        type="java:org.alfresco.repo.webservice.action.RuleFilter"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
-        qname="ns:ActionItemDefinition"
-        type="java:org.alfresco.repo.webservice.action.ActionItemDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>ContentFormat>mimetype"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Query"
-        type="java:org.alfresco.repo.webservice.types.Query"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
-        qname="ns:Action"
-        type="java:org.alfresco.repo.webservice.action.Action"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Name"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>ContentFormat>encoding"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
-        qname="ns:RuleType"
-        type="java:org.alfresco.repo.webservice.action.RuleType"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"
@@ -379,6 +355,14 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:RoleDefinition"
+        type="java:org.alfresco.repo.webservice.types.RoleDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
         qname="ns:ActionExecutionResult"
@@ -389,8 +373,8 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:RoleDefinition"
-        type="java:org.alfresco.repo.webservice.types.RoleDefinition"
+        qname="ns:PropertyDefinition"
+        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
diff --git a/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd
index 23919b3b1b..92db529fb0 100644
--- a/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd
@@ -60,14 +60,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -212,14 +204,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
diff --git a/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd
index 5dedd6f429..47cdc8e897 100644
--- a/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd
@@ -87,14 +87,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -255,14 +247,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
diff --git a/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd
index 8b408073fd..a167058c20 100644
--- a/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd
@@ -51,14 +51,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -179,14 +171,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
diff --git a/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd
index 49c9dc68ab..63bee7ef99 100644
--- a/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd
@@ -47,14 +47,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -183,14 +175,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
diff --git a/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
index 570e975c1c..df916f2037 100644
--- a/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
@@ -48,14 +48,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -184,14 +176,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
diff --git a/source/generated/org/alfresco/repo/webservice/repository/RepositoryServiceSoapPort.java b/source/generated/org/alfresco/repo/webservice/repository/RepositoryServiceSoapPort.java
index 8bc67d0730..8080e8ff9f 100644
--- a/source/generated/org/alfresco/repo/webservice/repository/RepositoryServiceSoapPort.java
+++ b/source/generated/org/alfresco/repo/webservice/repository/RepositoryServiceSoapPort.java
@@ -12,7 +12,7 @@ public interface RepositoryServiceSoapPort extends java.rmi.Remote {
     /**
      * Creates a new repository store.
      */
-    public org.alfresco.repo.webservice.types.Store createStore(org.alfresco.repo.webservice.types.StoreEnum scheme, java.lang.String address) throws java.rmi.RemoteException, org.alfresco.repo.webservice.repository.RepositoryFault;
+    public org.alfresco.repo.webservice.types.Store createStore(java.lang.String scheme, java.lang.String address) throws java.rmi.RemoteException, org.alfresco.repo.webservice.repository.RepositoryFault;
 
     /**
      * Retrieves a list of stores where content resources are held.
diff --git a/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd
index c3ef253ed7..987db20d91 100644
--- a/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd
@@ -21,7 +21,7 @@
       <parameter name="wsdlPortType" value="RepositoryServiceSoapPort"/>
       <parameter name="typeMappingVersion" value="1.2"/>
       <operation name="createStore" qname="operNS:createStore" xmlns:operNS="http://www.alfresco.org/ws/service/repository/1.0" returnQName="retNS:createStoreReturn" xmlns:retNS="http://www.alfresco.org/ws/service/repository/1.0" returnType="rtns:Store" xmlns:rtns="http://www.alfresco.org/ws/model/content/1.0" soapAction="http://www.alfresco.org/ws/service/repository/1.0/createStore" >
-        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:StoreEnum" xmlns:tns="http://www.alfresco.org/ws/model/content/1.0"/>
+        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <parameter qname="pns:address" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <fault name="RepositoryFault" qname="fns:RepositoryFault" xmlns:fns="http://www.alfresco.org/ws/service/repository/1.0" class="org.alfresco.repo.webservice.repository.RepositoryFault" type="tns:RepositoryFault" xmlns:tns="http://www.alfresco.org/ws/service/repository/1.0"/>
       </operation>
@@ -73,14 +73,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>move"
@@ -392,14 +384,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>removeAssociation"
diff --git a/source/generated/org/alfresco/repo/webservice/types/NamedValue.java b/source/generated/org/alfresco/repo/webservice/types/NamedValue.java
index 4fbd44b369..a6e97389da 100644
--- a/source/generated/org/alfresco/repo/webservice/types/NamedValue.java
+++ b/source/generated/org/alfresco/repo/webservice/types/NamedValue.java
@@ -206,7 +206,7 @@ public class NamedValue  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "values"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         elemField.setMaxOccursUnbounded(true);
         typeDesc.addFieldDesc(elemField);
     }
diff --git a/source/generated/org/alfresco/repo/webservice/types/Query.java b/source/generated/org/alfresco/repo/webservice/types/Query.java
index 6a872d3bc0..04b8d492a4 100644
--- a/source/generated/org/alfresco/repo/webservice/types/Query.java
+++ b/source/generated/org/alfresco/repo/webservice/types/Query.java
@@ -8,7 +8,7 @@
 package org.alfresco.repo.webservice.types;
 
 public class Query  implements java.io.Serializable {
-    private org.alfresco.repo.webservice.types.QueryLanguageEnum language;
+    private java.lang.String language;
 
     private java.lang.String statement;
 
@@ -16,7 +16,7 @@ public class Query  implements java.io.Serializable {
     }
 
     public Query(
-           org.alfresco.repo.webservice.types.QueryLanguageEnum language,
+           java.lang.String language,
            java.lang.String statement) {
            this.language = language;
            this.statement = statement;
@@ -28,7 +28,7 @@ public class Query  implements java.io.Serializable {
      * 
      * @return language
      */
-    public org.alfresco.repo.webservice.types.QueryLanguageEnum getLanguage() {
+    public java.lang.String getLanguage() {
         return language;
     }
 
@@ -38,7 +38,7 @@ public class Query  implements java.io.Serializable {
      * 
      * @param language
      */
-    public void setLanguage(org.alfresco.repo.webservice.types.QueryLanguageEnum language) {
+    public void setLanguage(java.lang.String language) {
         this.language = language;
     }
 
@@ -110,7 +110,7 @@ public class Query  implements java.io.Serializable {
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("language");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "language"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "QueryLanguageEnum"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
diff --git a/source/generated/org/alfresco/repo/webservice/types/QueryLanguageEnum.java b/source/generated/org/alfresco/repo/webservice/types/QueryLanguageEnum.java
deleted file mode 100644
index ceba3cbfb6..0000000000
--- a/source/generated/org/alfresco/repo/webservice/types/QueryLanguageEnum.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * QueryLanguageEnum.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.3 Oct 05, 2005 (05:23:37 EDT) WSDL2Java emitter.
- */
-
-package org.alfresco.repo.webservice.types;
-
-public class QueryLanguageEnum implements java.io.Serializable {
-    private java.lang.String _value_;
-    private static java.util.HashMap _table_ = new java.util.HashMap();
-
-    // Constructor
-    protected QueryLanguageEnum(java.lang.String value) {
-        _value_ = value;
-        _table_.put(_value_,this);
-    }
-
-    public static final java.lang.String _lucene = "lucene";
-    public static final java.lang.String _xpath = "xpath";
-    public static final java.lang.String _cql = "cql";
-    public static final QueryLanguageEnum lucene = new QueryLanguageEnum(_lucene);
-    public static final QueryLanguageEnum xpath = new QueryLanguageEnum(_xpath);
-    public static final QueryLanguageEnum cql = new QueryLanguageEnum(_cql);
-    public java.lang.String getValue() { return _value_;}
-    public static QueryLanguageEnum fromValue(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        QueryLanguageEnum enumeration = (QueryLanguageEnum)
-            _table_.get(value);
-        if (enumeration==null) enumeration = lucene;
-        return enumeration;
-    }
-    public static QueryLanguageEnum fromString(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        return fromValue(value);
-    }
-    public boolean equals(java.lang.Object obj) {return (obj == this);}
-    public int hashCode() { return toString().hashCode();}
-    public java.lang.String toString() { return _value_;}
-    public java.lang.Object readResolve() throws java.io.ObjectStreamException { return fromValue(_value_);}
-    public static org.apache.axis.encoding.Serializer getSerializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumSerializer(
-            _javaType, _xmlType);
-    }
-    public static org.apache.axis.encoding.Deserializer getDeserializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumDeserializer(
-            _javaType, _xmlType);
-    }
-    // Type metadata
-    private static org.apache.axis.description.TypeDesc typeDesc =
-        new org.apache.axis.description.TypeDesc(QueryLanguageEnum.class);
-
-    static {
-        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "QueryLanguageEnum"));
-    }
-    /**
-     * Return type metadata object
-     */
-    public static org.apache.axis.description.TypeDesc getTypeDesc() {
-        return typeDesc;
-    }
-
-}
diff --git a/source/generated/org/alfresco/repo/webservice/types/Store.java b/source/generated/org/alfresco/repo/webservice/types/Store.java
index fb5d42398c..d5797c67e9 100644
--- a/source/generated/org/alfresco/repo/webservice/types/Store.java
+++ b/source/generated/org/alfresco/repo/webservice/types/Store.java
@@ -8,7 +8,7 @@
 package org.alfresco.repo.webservice.types;
 
 public class Store  implements java.io.Serializable {
-    private org.alfresco.repo.webservice.types.StoreEnum scheme;
+    private java.lang.String scheme;
 
     private java.lang.String address;
 
@@ -16,7 +16,7 @@ public class Store  implements java.io.Serializable {
     }
 
     public Store(
-           org.alfresco.repo.webservice.types.StoreEnum scheme,
+           java.lang.String scheme,
            java.lang.String address) {
            this.scheme = scheme;
            this.address = address;
@@ -28,7 +28,7 @@ public class Store  implements java.io.Serializable {
      * 
      * @return scheme
      */
-    public org.alfresco.repo.webservice.types.StoreEnum getScheme() {
+    public java.lang.String getScheme() {
         return scheme;
     }
 
@@ -38,7 +38,7 @@ public class Store  implements java.io.Serializable {
      * 
      * @param scheme
      */
-    public void setScheme(org.alfresco.repo.webservice.types.StoreEnum scheme) {
+    public void setScheme(java.lang.String scheme) {
         this.scheme = scheme;
     }
 
@@ -110,7 +110,7 @@ public class Store  implements java.io.Serializable {
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("scheme");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "scheme"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "StoreEnum"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
diff --git a/source/generated/org/alfresco/repo/webservice/types/StoreEnum.java b/source/generated/org/alfresco/repo/webservice/types/StoreEnum.java
deleted file mode 100644
index 7e60c44f3a..0000000000
--- a/source/generated/org/alfresco/repo/webservice/types/StoreEnum.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * StoreEnum.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.3 Oct 05, 2005 (05:23:37 EDT) WSDL2Java emitter.
- */
-
-package org.alfresco.repo.webservice.types;
-
-public class StoreEnum implements java.io.Serializable {
-    private java.lang.String _value_;
-    private static java.util.HashMap _table_ = new java.util.HashMap();
-
-    // Constructor
-    protected StoreEnum(java.lang.String value) {
-        _value_ = value;
-        _table_.put(_value_,this);
-    }
-
-    public static final java.lang.String _workspace = "workspace";
-    public static final java.lang.String _versionStore = "versionStore";
-    public static final java.lang.String _user = "user";
-    public static final java.lang.String _search = "search";
-    public static final java.lang.String _http = "http";
-    public static final java.lang.String _system = "system";
-    public static final StoreEnum workspace = new StoreEnum(_workspace);
-    public static final StoreEnum versionStore = new StoreEnum(_versionStore);
-    public static final StoreEnum user = new StoreEnum(_user);
-    public static final StoreEnum search = new StoreEnum(_search);
-    public static final StoreEnum http = new StoreEnum(_http);
-    public static final StoreEnum system = new StoreEnum(_system);
-    public java.lang.String getValue() { return _value_;}
-    public static StoreEnum fromValue(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        StoreEnum enumeration = (StoreEnum)
-            _table_.get(value);
-        if (enumeration==null) enumeration = workspace;
-        return enumeration;
-    }
-    public static StoreEnum fromString(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        return fromValue(value);
-    }
-    public boolean equals(java.lang.Object obj) {return (obj == this);}
-    public int hashCode() { return toString().hashCode();}
-    public java.lang.String toString() { return _value_;}
-    public java.lang.Object readResolve() throws java.io.ObjectStreamException { return fromValue(_value_);}
-    public static org.apache.axis.encoding.Serializer getSerializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumSerializer(
-            _javaType, _xmlType);
-    }
-    public static org.apache.axis.encoding.Deserializer getDeserializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumDeserializer(
-            _javaType, _xmlType);
-    }
-    // Type metadata
-    private static org.apache.axis.description.TypeDesc typeDesc =
-        new org.apache.axis.description.TypeDesc(StoreEnum.class);
-
-    static {
-        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "StoreEnum"));
-    }
-    /**
-     * Return type metadata object
-     */
-    public static org.apache.axis.description.TypeDesc getTypeDesc() {
-        return typeDesc;
-    }
-
-}
diff --git a/source/java/org/alfresco/repo/webservice/Utils.java b/source/java/org/alfresco/repo/webservice/Utils.java
index 3a36237fd1..491da00cf9 100644
--- a/source/java/org/alfresco/repo/webservice/Utils.java
+++ b/source/java/org/alfresco/repo/webservice/Utils.java
@@ -37,11 +37,9 @@ import org.alfresco.repo.webservice.types.ParentReference;
 import org.alfresco.repo.webservice.types.Predicate;
 import org.alfresco.repo.webservice.types.PropertyDefinition;
 import org.alfresco.repo.webservice.types.Query;
-import org.alfresco.repo.webservice.types.QueryLanguageEnum;
 import org.alfresco.repo.webservice.types.Reference;
 import org.alfresco.repo.webservice.types.RoleDefinition;
 import org.alfresco.repo.webservice.types.Store;
-import org.alfresco.repo.webservice.types.StoreEnum;
 import org.alfresco.repo.webservice.types.Version;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -80,6 +78,12 @@ public class Utils
         // don't allow construction
     }
     
+    /** Query language names */
+    public static final String QUERY_LANG_LUCENE = "lucene";
+    public static final String QUERY_LANG_XPATH = "xpath";
+    public static final String QUERY_LANG_CQL = "cql";
+    
+    
     /**
      * Utility method to convert from a string representation of a property value into the correct object representation.
      * 
@@ -222,7 +226,7 @@ public class Utils
      */
     public static StoreRef convertToStoreRef(Store store)
     {
-        return new StoreRef(store.getScheme().getValue(), store.getAddress());
+        return new StoreRef(store.getScheme(), store.getAddress());
     }
 
     /**
@@ -234,7 +238,7 @@ public class Utils
      */
     public static Store convertToStore(StoreRef ref)
     {
-        return new Store(StoreEnum.fromValue(ref.getProtocol()), ref
+        return new Store(ref.getProtocol(), ref
                 .getIdentifier());
     }
 
@@ -284,8 +288,7 @@ public class Utils
     public static Reference convertToReference(NodeRef node)
     {
         Reference ref = new Reference();
-        Store store = new Store(StoreEnum.fromValue(node.getStoreRef()
-                .getProtocol()), node.getStoreRef().getIdentifier());
+        Store store = new Store(node.getStoreRef().getProtocol(), node.getStoreRef().getIdentifier());
         ref.setStore(store);
         ref.setUuid(node.getId());
         return ref;
@@ -351,7 +354,7 @@ public class Utils
             {
                 StringBuilder builder = new StringBuilder(
                         "Failed to resolve to a single NodeRef with parameters (store=");
-                builder.append(store.getScheme().getValue()).append(":")
+                builder.append(store.getScheme()).append(":")
                         .append(store.getAddress());
                 builder.append(" uuid=").append(uuid);
                 builder.append(" path=").append(path).append("), found ");
@@ -425,13 +428,11 @@ public class Utils
                         "A Store has to be supplied to in order to execute a query.");
             }
 
-            QueryLanguageEnum langEnum = query.getLanguage();
-
-            if (langEnum.equals(QueryLanguageEnum.cql)
-                    || langEnum.equals(QueryLanguageEnum.xpath))
+            String language = query.getLanguage();
+            if (language.equals(QUERY_LANG_LUCENE) != true)
             {
                 throw new IllegalArgumentException("Only '"
-                        + QueryLanguageEnum.lucene.getValue()
+                        + QUERY_LANG_LUCENE
                         + "' queries are currently supported!");
             }
 
@@ -440,8 +441,7 @@ public class Utils
             try
             {
                 searchResults = searchService.query(Utils
-                    .convertToStoreRef(predicate.getStore()), langEnum
-                    .getValue(), query.getStatement());
+                    .convertToStoreRef(predicate.getStore()), language, query.getStatement());
                 // get hold of all the NodeRef's from the results
                 nodeRefs = searchResults.getNodeRefs();
             }
diff --git a/source/java/org/alfresco/repo/webservice/action/ActionWebService.java b/source/java/org/alfresco/repo/webservice/action/ActionWebService.java
index 5e3dcea97f..930885b85c 100644
--- a/source/java/org/alfresco/repo/webservice/action/ActionWebService.java
+++ b/source/java/org/alfresco/repo/webservice/action/ActionWebService.java
@@ -26,7 +26,6 @@ import org.alfresco.repo.action.ActionConditionImpl;
 import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.repo.action.CompositeActionImpl;
 import org.alfresco.repo.action.executer.CompositeActionExecuter;
-import org.alfresco.repo.rule.RuleImpl;
 import org.alfresco.repo.transaction.TransactionComponent;
 import org.alfresco.repo.transaction.TransactionUtil;
 import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
@@ -482,26 +481,17 @@ public class ActionWebService extends AbstractWebService implements ActionServic
             }
         }
         
-        // Get the reference to the 'owning' node
-        NodeRef owningNodeRef = action.getOwningNodeRef();
-        Reference reference = null; 
-        if (owningNodeRef != null)
-        {
-            reference = Utils.convertToReference(owningNodeRef);
-        }
-        
         // Create the web service action object
         org.alfresco.repo.webservice.action.Action webServiceAction = new org.alfresco.repo.webservice.action.Action(
+                Utils.convertToReference(action.getNodeRef()),
                 action.getId(),
                 action.getActionDefinitionName(),
                 action.getTitle(),
                 action.getDescription(),
-                action.getExecuteAsychronously(),
                 namedValues,
                 webServiceConditions,
                 webServiceCompensatingAction,
-                childWebServiceActions,
-                reference);
+                childWebServiceActions);
         
         return webServiceAction;
     }
@@ -638,15 +628,12 @@ public class ActionWebService extends AbstractWebService implements ActionServic
             id = GUID.generate();
         }
         
-        // Get the owning node ref
-        NodeRef owningNodeRef = null;
-        if (webServiceAction.getReference() != null)
+        // Try and get the action node reference
+        NodeRef actionNodeRef = null;
+        Reference actionReference = webServiceAction.getActionReference();
+        if (actionReference != null)
         {
-            owningNodeRef = Utils.convertToNodeRef(
-                webServiceAction.getReference(),
-                this.nodeService,
-                this.searchService,
-                this.namespaceService);
+            actionNodeRef = Utils.convertToNodeRef(actionReference, this.nodeService, this.searchService, this.namespaceService);
         }
         
         // Create the action (or composite action)
@@ -654,20 +641,16 @@ public class ActionWebService extends AbstractWebService implements ActionServic
         String actionDefinitionName = webServiceAction.getActionName();        
         if (CompositeActionExecuter.NAME.equals(actionDefinitionName) == true)
         {
-            action = new CompositeActionImpl(id, owningNodeRef);
+            action = new CompositeActionImpl(actionNodeRef, id);
         }
         else
         {
-            action = new ActionImpl(id, actionDefinitionName, owningNodeRef);
+            action = new ActionImpl(actionNodeRef, id, actionDefinitionName);
         }
         
         // Set some of the action's details
         action.setTitle(webServiceAction.getTitle());
         action.setDescription(webServiceAction.getDescription());
-        if (webServiceAction.isExecuteAsynchronously() == true)
-        {
-            action.setExecuteAsynchronously(true);
-        }
         
         // Set the parameters
         NamedValue[] namedValues = webServiceAction.getParameters();
@@ -958,51 +941,23 @@ public class ActionWebService extends AbstractWebService implements ActionServic
     }
     
     private org.alfresco.repo.webservice.action.Rule convertToWebServiceRule(Rule rule)
-    {
-        // Get the run as user
-        // TODO for now set to null since this has no effect yet
-        String runAsUserName = null;
-        
-        // Get the conditions
-        List<ActionCondition> conditions = rule.getActionConditions();
-        Condition[] webServiceConditions = new Condition[conditions.size()];
-        int index2 = 0;
-        for (ActionCondition condition : conditions)
-        {
-            webServiceConditions[index2] = convertToWebServiceCondition(condition);
-            index2++;
-        }
-                
-        // Sort out any sub-actions
-        org.alfresco.repo.webservice.action.Action[] childWebServiceActions = null;
-        List<Action> childActions = rule.getActions();
-        childWebServiceActions = new org.alfresco.repo.webservice.action.Action[childActions.size()];
-        int index3 = 0;
-        for (Action childAction : childActions)
-        {
-            childWebServiceActions[index3] = convertToWebServiceAction(childAction);
-            index3 ++;
-        }
-        
-        // Get the reference to the 'owning' node
-        NodeRef owningNodeRef = rule.getOwningNodeRef();
-        Reference reference = null; 
+    {        
+        Reference owningReference = null;
+        NodeRef owningNodeRef = this.ruleService.getOwningNodeRef(rule);
         if (owningNodeRef != null)
         {
-            reference = Utils.convertToReference(owningNodeRef);
+            owningReference = Utils.convertToReference(owningNodeRef);
         }
         
         // Create the web service rule object
         org.alfresco.repo.webservice.action.Rule webServiceRule = new org.alfresco.repo.webservice.action.Rule(
-                rule.getId(),
-                rule.getRuleTypeName(),
+                Utils.convertToReference(rule.getNodeRef()),
+                owningReference,
+                rule.getRuleTypes().toArray(new String[rule.getRuleTypes().size()]),
                 rule.getTitle(),
                 rule.getDescription(),
-                rule.getExecuteAsychronously(),
-                webServiceConditions,
-                childWebServiceActions,
-                runAsUserName,
-                reference);
+                rule.getExecuteAsynchronously(),
+                convertToWebServiceAction(rule.getAction()));
         
         return webServiceRule;
     }
@@ -1123,56 +1078,38 @@ public class ActionWebService extends AbstractWebService implements ActionServic
      * @return
      */
     private Rule convertToRule(org.alfresco.repo.webservice.action.Rule webServiceRule)
-    {
-        // If the id is null then generate one
-        String id = webServiceRule.getId();
-        if (id == null || id.length() == 0)
+    {        
+        NodeRef ruleNodeRef = null;
+        if (webServiceRule.getRuleReference() != null)
         {
-            id = GUID.generate();
-        }
-        
-        // Get the owning node ref
-        NodeRef owningNodeRef = null;
-        if (webServiceRule.getReference() != null)
-        {
-            owningNodeRef = Utils.convertToNodeRef(
-                webServiceRule.getReference(),
-                this.nodeService,
-                this.searchService,
-                this.namespaceService);
+            ruleNodeRef = Utils.convertToNodeRef(
+                    webServiceRule.getRuleReference(), 
+                    this.nodeService, 
+                    this.searchService, 
+                    this.namespaceService);
         }
         
         // Get the rule type name
-        String ruleTypeName = webServiceRule.getRuleType();
+        String[] ruleTypes = webServiceRule.getRuleTypes();
         
         // Create the rule
-        RuleImpl rule = new RuleImpl(id, ruleTypeName, owningNodeRef);
+        Rule rule = new Rule();
+        List<String> ruleTypesList = new ArrayList<String>(ruleTypes.length);
+        for (String ruleType : ruleTypes)
+        {
+            ruleTypesList.add(ruleType);
+        }
+        rule.setRuleTypes(ruleTypesList);
+        rule.setNodeRef(ruleNodeRef);    
         
         // Set some of the rules details
         rule.setTitle(webServiceRule.getTitle());
         rule.setDescription(webServiceRule.getDescription());
-        rule.setExecuteAsynchronously(webServiceRule.isExecuteAsynchronously());        
+        rule.setExecuteAsynchronously(webServiceRule.isExecuteAsynchronously());
         
-        // Set the conditions
-        Condition[] webServiceConditions = webServiceRule.getConditions();
-        if (webServiceConditions != null)
-        {
-            for (Condition webServiceCondition : webServiceConditions)
-            {
-                rule.addActionCondition(convertToActionCondition(webServiceCondition));
-            }
-        }
-        
-        // Set the child actions 
-        org.alfresco.repo.webservice.action.Action[] webServiceChildActions = webServiceRule.getActions();
-        if (webServiceChildActions != null)
-        {
-            for (org.alfresco.repo.webservice.action.Action webServiceChildAction : webServiceChildActions)
-            {
-                Action childAction = convertToAction(webServiceChildAction);
-                rule.addAction(childAction);
-            }
-        }
+        // Set the action
+        Action action = convertToAction(webServiceRule.getAction());
+        rule.setAction(action);
         
         return rule;
     }
diff --git a/source/java/org/alfresco/repo/webservice/authentication/AuthenticationWebService.java b/source/java/org/alfresco/repo/webservice/authentication/AuthenticationWebService.java
index cd96747cc2..4a7b20eaad 100644
--- a/source/java/org/alfresco/repo/webservice/authentication/AuthenticationWebService.java
+++ b/source/java/org/alfresco/repo/webservice/authentication/AuthenticationWebService.java
@@ -68,10 +68,12 @@ public class AuthenticationWebService implements AuthenticationServiceSoapPort
         } 
         catch (AuthenticationException ae)
         {
+            ae.printStackTrace();
             throw new AuthenticationFault(100, ae.getMessage());
         } 
         catch (Throwable e)
         {
+            e.printStackTrace();
             throw new AuthenticationFault(0, e.getMessage());
         }
     }
diff --git a/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java b/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java
index d7c073f5e7..88836e3b25 100644
--- a/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java
+++ b/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java
@@ -35,10 +35,8 @@ import org.alfresco.repo.webservice.types.Node;
 import org.alfresco.repo.webservice.types.NodeDefinition;
 import org.alfresco.repo.webservice.types.Predicate;
 import org.alfresco.repo.webservice.types.Query;
-import org.alfresco.repo.webservice.types.QueryLanguageEnum;
 import org.alfresco.repo.webservice.types.Reference;
 import org.alfresco.repo.webservice.types.Store;
-import org.alfresco.repo.webservice.types.StoreEnum;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -103,14 +101,10 @@ public class RepositoryWebService extends AbstractWebService implements
     /**
      * @see org.alfresco.repo.webservice.repository.RepositoryServiceSoapPort#createStore(org.alfresco.repo.webservice.types.StoreEnum, java.lang.String)
      */
-    public Store createStore(StoreEnum scheme, String address) throws RemoteException, RepositoryFault
+    public Store createStore(String scheme, String address) throws RemoteException, RepositoryFault
     {
-        String protocol = scheme.getValue();
-        StoreRef storeRef = this.nodeService.createStore(protocol, address);
-        
-        StoreEnum storeEnum = StoreEnum.fromString(storeRef
-                .getProtocol());
-        return new Store(storeEnum, storeRef.getIdentifier());
+        StoreRef storeRef = this.nodeService.createStore(scheme, address);
+        return Utils.convertToStore(storeRef);
     }
 
     /**
@@ -136,9 +130,7 @@ public class RepositoryWebService extends AbstractWebService implements
                     logger.debug("Store protocol :" + storeRef.getProtocol());
                 }
                 
-                StoreEnum storeEnum = StoreEnum.fromString(storeRef
-                        .getProtocol());
-                Store store = new Store(storeEnum, storeRef.getIdentifier());
+                Store store = Utils.convertToStore(storeRef);
                 returnStores[x] = store;
             }
 
@@ -175,13 +167,11 @@ public class RepositoryWebService extends AbstractWebService implements
     public QueryResult query(Store store, Query query, boolean includeMetaData)
             throws RemoteException, RepositoryFault
     {
-        QueryLanguageEnum langEnum = query.getLanguage();
-
-        if (langEnum.equals(QueryLanguageEnum.cql)
-                || langEnum.equals(QueryLanguageEnum.xpath))
+        String language = query.getLanguage();
+        if (language.equals(Utils.QUERY_LANG_LUCENE) == false)
         {
             throw new RepositoryFault(110, "Only '"
-                    + QueryLanguageEnum.lucene.getValue()
+                    + Utils.QUERY_LANG_LUCENE
                     + "' queries are currently supported!");
         }
 
diff --git a/source/java/org/alfresco/repo/webservice/repository/ResultSetQuerySession.java b/source/java/org/alfresco/repo/webservice/repository/ResultSetQuerySession.java
index ad4a21824e..d3daf98e23 100644
--- a/source/java/org/alfresco/repo/webservice/repository/ResultSetQuerySession.java
+++ b/source/java/org/alfresco/repo/webservice/repository/ResultSetQuerySession.java
@@ -90,7 +90,7 @@ public class ResultSetQuerySession extends AbstractQuerySession
          try
          {
             searchResults = searchService.query(Utils.convertToStoreRef(this.store), 
-                  this.query.getLanguage().getValue(), statement);
+                  this.query.getLanguage(), statement);
          
             int totalRows = searchResults.length();
             int lastRow = calculateLastRowIndex(totalRows);
@@ -174,8 +174,8 @@ public class ResultSetQuerySession extends AbstractQuerySession
       builder.append(" (id=").append(getId());
       builder.append(" batchSize=").append(this.batchSize);
       builder.append(" position=").append(this.position);
-      builder.append(" store=").append(this.store.getScheme().getValue()).append(":").append(this.store.getAddress());
-      builder.append(" language=").append(this.query.getLanguage().getValue());
+      builder.append(" store=").append(this.store.getScheme()).append(":").append(this.store.getAddress());
+      builder.append(" language=").append(this.query.getLanguage());
       builder.append(" statement=").append(this.query.getStatement());
       builder.append(")");
       return builder.toString();
diff --git a/source/web/WEB-INF/server-config.wsdd b/source/web/WEB-INF/server-config.wsdd
index 982c5abe8c..4e11348be5 100644
--- a/source/web/WEB-INF/server-config.wsdd
+++ b/source/web/WEB-INF/server-config.wsdd
@@ -28,14 +28,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -156,14 +148,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -441,7 +425,7 @@
       	<handler type="QueryConfigHandler"/>
   		</requestFlow>
 	   <!-- generated below here -->
-	     <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/repository/1.0"/>
+	  <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/repository/1.0"/>
       <parameter name="wsdlServiceElement" value="RepositoryService"/>
       <parameter name="schemaQualified" value="http://www.alfresco.org/ws/service/repository/1.0,http://www.alfresco.org/ws/headers/1.0,http://www.alfresco.org/ws/model/content/1.0,http://www.alfresco.org/ws/cml/1.0"/>
       <parameter name="wsdlServicePort" value="RepositoryService"/>
@@ -449,7 +433,7 @@
       <parameter name="wsdlPortType" value="RepositoryServiceSoapPort"/>
       <parameter name="typeMappingVersion" value="1.2"/>
       <operation name="createStore" qname="operNS:createStore" xmlns:operNS="http://www.alfresco.org/ws/service/repository/1.0" returnQName="retNS:createStoreReturn" xmlns:retNS="http://www.alfresco.org/ws/service/repository/1.0" returnType="rtns:Store" xmlns:rtns="http://www.alfresco.org/ws/model/content/1.0" soapAction="http://www.alfresco.org/ws/service/repository/1.0/createStore" >
-        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:StoreEnum" xmlns:tns="http://www.alfresco.org/ws/model/content/1.0"/>
+        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <parameter qname="pns:address" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <fault name="RepositoryFault" qname="fns:RepositoryFault" xmlns:fns="http://www.alfresco.org/ws/service/repository/1.0" class="org.alfresco.repo.webservice.repository.RepositoryFault" type="tns:RepositoryFault" xmlns:tns="http://www.alfresco.org/ws/service/repository/1.0"/>
       </operation>
@@ -501,14 +485,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>move"
@@ -820,14 +796,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>removeAssociation"
@@ -953,14 +921,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -1089,14 +1049,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -1302,14 +1254,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -1470,14 +1414,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -1647,14 +1583,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -1775,14 +1703,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -1922,7 +1842,7 @@
       	  <handler type="WSSecurity"/>
   		</requestFlow>
 	   <!-- generated below here -->
-       <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/action/1.0"/>
+        <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/action/1.0"/>
       <parameter name="wsdlServiceElement" value="ActionService"/>
       <parameter name="schemaQualified" value="http://www.alfresco.org/ws/service/action/1.0,http://www.alfresco.org/ws/model/content/1.0"/>
       <parameter name="wsdlServicePort" value="ActionService"/>
@@ -1992,14 +1912,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -2168,14 +2080,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -2320,7 +2224,7 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-    </service>
+  </service>
     
     <service name="AccessControlService" provider="java:SpringRPC" style="wrapped" use="literal">
 	   <documentation>Access control web service API.</documentation>
@@ -2390,14 +2294,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -2558,14 +2454,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -2753,14 +2641,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -2905,14 +2785,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -3074,14 +2946,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -3210,14 +3074,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
diff --git a/source/wsdl/action-service.wsdl b/source/wsdl/action-service.wsdl
index fdc5d53780..a48a002ff7 100644
--- a/source/wsdl/action-service.wsdl
+++ b/source/wsdl/action-service.wsdl
@@ -58,16 +58,15 @@
 
          <complexType name="Action">
             <sequence>
+               <element name="actionReference" type="cms:Reference" nillable="true"/>
                <element name="id" type="xsd:string" nillable="true"/>
                <element name="actionName" type="xsd:string"/>
                <element name="title" type="xsd:string" nillable="true"/>
                <element name="description" type="xsd:string" nillable="true"/>
-               <element name="executeAsynchronously" type="xsd:boolean"/>
                <element name="parameters" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
                <element name="conditions" type="action:Condition" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
                <element name="compensatingAction" type="action:Action" nillable="true"/>
                <element name="actions" type="action:Action" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
-               <element name="reference" type="cms:Reference" nillable="true"/>
             </sequence>
          </complexType>
          <element name="Action" type="action:Action"/>
@@ -82,15 +81,13 @@
 
          <complexType name="Rule">
             <sequence>
-               <element name="id" type="xsd:string" nillable="true"/>
-               <element name="ruleType" type="xsd:string"/>
+               <element name="ruleReference" type="cms:Reference" nillable="true"/>               
+               <element name="owningReference" type="cms:Reference" nillable="true"/>
+               <element name="ruleTypes" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
                <element name="title" type="xsd:string" nillable="true"/>
                <element name="description" type="xsd:string" nillable="true"/>
                <element name="executeAsynchronously" type="xsd:boolean"/>
-               <element name="conditions" type="action:Condition" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
-               <element name="actions" type="action:Action" maxOccurs="unbounded" minOccurs="1"/>
-               <element name="runAsUserName" type="xsd:string" nillable="true"/>
-               <element name="reference" type="cms:Reference" nillable="true"/>
+               <element name="action" type="action:Action"/>
             </sequence>
          </complexType>
          <element name="Rule" type="action:Rule"/>
diff --git a/source/wsdl/repository-service.wsdl b/source/wsdl/repository-service.wsdl
index 79b0428830..bde5c691f9 100644
--- a/source/wsdl/repository-service.wsdl
+++ b/source/wsdl/repository-service.wsdl
@@ -21,7 +21,7 @@
          <element name="createStore">
          	<complexType>
                <sequence>
-                  <element name="scheme" type="cms:StoreEnum"/>
+                  <element name="scheme" type="xsd:string"/>
                   <element name="address" type="xsd:string"/>
                </sequence>
             </complexType>
diff --git a/source/wsdl/types.xsd b/source/wsdl/types.xsd
index 2fb45f84c5..b8f867b07b 100644
--- a/source/wsdl/types.xsd
+++ b/source/wsdl/types.xsd
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:cms="http://www.alfresco.org/ws/model/content/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.alfresco.org/ws/model/content/1.0" elementFormDefault="qualified" version="0.1">
     <xsd:annotation>
     	<xsd:documentation>Alfresco Web Services for Content Management. Type Definitions - Draft.</xsd:documentation>
@@ -31,21 +30,10 @@
 			<xsd:minLength value="1"/>
 		</xsd:restriction>
 	</xsd:simpleType>
-
-    <xsd:simpleType name="StoreEnum">
-    	<xsd:restriction base="xsd:string">
-    		<xsd:enumeration value="workspace"/>
-    		<xsd:enumeration value="versionStore"/>
-    		<xsd:enumeration value="user"/>
-    		<xsd:enumeration value="search"/>
-    		<xsd:enumeration value="http"/>
-    		<xsd:enumeration value="system"/>
-    	</xsd:restriction>
-    </xsd:simpleType>
     
     <xsd:complexType name="Store">
     	<xsd:sequence>
-    		<xsd:element name="scheme" type="cms:StoreEnum"/>
+    		<xsd:element name="scheme" type="xsd:string"/>
     		<xsd:element name="address">
     			<xsd:simpleType>
     				<xsd:restriction base="xsd:string">
@@ -218,17 +206,9 @@
 	<!-- Query Definitions -->
 	<!-- -->
 
-    <xsd:simpleType name="QueryLanguageEnum">
-    	<xsd:restriction base="xsd:string">
-    		<xsd:enumeration value="lucene"/>
-    		<xsd:enumeration value="xpath"/>
-    		<xsd:enumeration value="cql"/>
-    	</xsd:restriction>
-    </xsd:simpleType>
-
     <xsd:complexType name="Query">
     	<xsd:sequence>
-    		<xsd:element name="language" type="cms:QueryLanguageEnum"/>
+    		<xsd:element name="language" type="xsd:string"/>
     		<xsd:element name="statement" type="xsd:string"/>
     	</xsd:sequence>
     </xsd:complexType>