diff --git a/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd
index 1c792f94ac..705d8b2043 100644
--- a/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd
@@ -320,14 +320,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        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:AssociationDefinition"
diff --git a/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd
index da100e530a..b2e487746b 100644
--- a/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/action/deploy.wsdd
@@ -339,14 +339,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        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:AssociationDefinition"
diff --git a/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd
index 92db529fb0..ae04e58903 100644
--- a/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/administration/deploy.wsdd
@@ -284,14 +284,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        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:AssociationDefinition"
diff --git a/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd
index 47cdc8e897..e34e22629f 100644
--- a/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/authoring/deploy.wsdd
@@ -327,14 +327,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        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:AssociationDefinition"
diff --git a/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd
index a167058c20..2b97e59ee2 100644
--- a/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/classification/deploy.wsdd
@@ -251,14 +251,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        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:AssociationDefinition"
diff --git a/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd
index 63bee7ef99..3a83b0edda 100644
--- a/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/content/deploy.wsdd
@@ -247,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:>Store>address"
-        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/content/1.0"
         qname="ns:ContentFault"
diff --git a/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
index df916f2037..b0dda8b3ca 100644
--- a/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/dictionary/deploy.wsdd
@@ -248,14 +248,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        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:AssociationDefinition"
diff --git a/source/generated/org/alfresco/repo/webservice/repository/UpdateResult.java b/source/generated/org/alfresco/repo/webservice/repository/UpdateResult.java
index a5479ab6b5..dafd9b3608 100644
--- a/source/generated/org/alfresco/repo/webservice/repository/UpdateResult.java
+++ b/source/generated/org/alfresco/repo/webservice/repository/UpdateResult.java
@@ -12,6 +12,8 @@ public class UpdateResult  implements java.io.Serializable {
 
     private org.alfresco.repo.webservice.types.ResultSet updateCount;
 
+    private java.lang.String sourceId;
+
     private org.alfresco.repo.webservice.types.Reference source;
 
     private org.alfresco.repo.webservice.types.Reference destination;
@@ -22,10 +24,12 @@ public class UpdateResult  implements java.io.Serializable {
     public UpdateResult(
            java.lang.String statement,
            org.alfresco.repo.webservice.types.ResultSet updateCount,
+           java.lang.String sourceId,
            org.alfresco.repo.webservice.types.Reference source,
            org.alfresco.repo.webservice.types.Reference destination) {
            this.statement = statement;
            this.updateCount = updateCount;
+           this.sourceId = sourceId;
            this.source = source;
            this.destination = destination;
     }
@@ -71,6 +75,26 @@ public class UpdateResult  implements java.io.Serializable {
     }
 
 
+    /**
+     * Gets the sourceId value for this UpdateResult.
+     * 
+     * @return sourceId
+     */
+    public java.lang.String getSourceId() {
+        return sourceId;
+    }
+
+
+    /**
+     * Sets the sourceId value for this UpdateResult.
+     * 
+     * @param sourceId
+     */
+    public void setSourceId(java.lang.String sourceId) {
+        this.sourceId = sourceId;
+    }
+
+
     /**
      * Gets the source value for this UpdateResult.
      * 
@@ -128,6 +152,9 @@ public class UpdateResult  implements java.io.Serializable {
             ((this.updateCount==null && other.getUpdateCount()==null) || 
              (this.updateCount!=null &&
               this.updateCount.equals(other.getUpdateCount()))) &&
+            ((this.sourceId==null && other.getSourceId()==null) || 
+             (this.sourceId!=null &&
+              this.sourceId.equals(other.getSourceId()))) &&
             ((this.source==null && other.getSource()==null) || 
              (this.source!=null &&
               this.source.equals(other.getSource()))) &&
@@ -151,6 +178,9 @@ public class UpdateResult  implements java.io.Serializable {
         if (getUpdateCount() != null) {
             _hashCode += getUpdateCount().hashCode();
         }
+        if (getSourceId() != null) {
+            _hashCode += getSourceId().hashCode();
+        }
         if (getSource() != null) {
             _hashCode += getSource().hashCode();
         }
@@ -180,6 +210,12 @@ public class UpdateResult  implements java.io.Serializable {
         elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("sourceId");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/repository/1.0", "sourceId"));
+        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("source");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/repository/1.0", "source"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
diff --git a/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd b/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd
index 987db20d91..4b05fb852d 100644
--- a/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd
+++ b/source/generated/org/alfresco/repo/webservice/repository/deploy.wsdd
@@ -241,14 +241,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        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/cml/1.0"
         qname="ns:>CML>create"
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLAddAspect.java b/source/generated/org/alfresco/repo/webservice/types/CMLAddAspect.java
index 7827f49ff7..22fe62f7b3 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLAddAspect.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLAddAspect.java
@@ -202,14 +202,14 @@ public class CMLAddAspect  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLAddChild.java b/source/generated/org/alfresco/repo/webservice/types/CMLAddChild.java
index 214b01c582..d02d3139c2 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLAddChild.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLAddChild.java
@@ -232,13 +232,14 @@ public class CMLAddChild  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "ParentReference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(false);
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("associationType");
@@ -259,14 +260,14 @@ public class CMLAddChild  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLCopy.java b/source/generated/org/alfresco/repo/webservice/types/CMLCopy.java
index 4f2b6ae427..070bc604a9 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLCopy.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLCopy.java
@@ -262,13 +262,14 @@ public class CMLCopy  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "ParentReference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(false);
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("associationType");
@@ -289,14 +290,14 @@ public class CMLCopy  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("children");
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLCreateAssociation.java b/source/generated/org/alfresco/repo/webservice/types/CMLCreateAssociation.java
index 43d65f6fdd..7b951aa72d 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLCreateAssociation.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLCreateAssociation.java
@@ -202,28 +202,28 @@ public class CMLCreateAssociation  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("from_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("association");
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLMove.java b/source/generated/org/alfresco/repo/webservice/types/CMLMove.java
index 5719b1e8c9..9b2e01c5f6 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLMove.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLMove.java
@@ -232,13 +232,14 @@ public class CMLMove  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "ParentReference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(false);
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("associationType");
@@ -259,14 +260,14 @@ public class CMLMove  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAspect.java b/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAspect.java
index d013f98a34..011039ba2e 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAspect.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAspect.java
@@ -148,14 +148,14 @@ public class CMLRemoveAspect  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAssociation.java b/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAssociation.java
index e01cfe2796..2c78003939 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAssociation.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLRemoveAssociation.java
@@ -202,28 +202,28 @@ public class CMLRemoveAssociation  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("from_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("association");
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLRemoveChild.java b/source/generated/org/alfresco/repo/webservice/types/CMLRemoveChild.java
index 36c4a727a1..d2c2093aab 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLRemoveChild.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLRemoveChild.java
@@ -172,28 +172,28 @@ public class CMLRemoveChild  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("from_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/generated/org/alfresco/repo/webservice/types/CMLUpdate.java b/source/generated/org/alfresco/repo/webservice/types/CMLUpdate.java
index 57ba896c9c..f46d0cd007 100644
--- a/source/generated/org/alfresco/repo/webservice/types/CMLUpdate.java
+++ b/source/generated/org/alfresco/repo/webservice/types/CMLUpdate.java
@@ -165,14 +165,14 @@ public class CMLUpdate  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/generated/org/alfresco/repo/webservice/types/Store.java b/source/generated/org/alfresco/repo/webservice/types/Store.java
index 2eaf74fe0b..d5797c67e9 100644
--- a/source/generated/org/alfresco/repo/webservice/types/Store.java
+++ b/source/generated/org/alfresco/repo/webservice/types/Store.java
@@ -111,13 +111,13 @@ public class Store  implements java.io.Serializable {
         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.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(true);
+        elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("address");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "address"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(true);
+        elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
     }
 
diff --git a/source/java/org/alfresco/repo/webservice/CMLUtil.java b/source/java/org/alfresco/repo/webservice/CMLUtil.java
index ad8a9923b3..f6876c57d7 100644
--- a/source/java/org/alfresco/repo/webservice/CMLUtil.java
+++ b/source/java/org/alfresco/repo/webservice/CMLUtil.java
@@ -253,7 +253,7 @@ public class CMLUtil
             context.addId(id, nodeRef);
         }
 
-        results.add(createResult(CREATE, null, nodeRef));
+        results.add(createResult(CREATE, id, null, nodeRef));
     }
     
     /**
@@ -277,10 +277,14 @@ public class CMLUtil
         return properties;
     }
     
-    private UpdateResult createResult(String cmd, NodeRef sourceNodeRef, NodeRef destinationNodeRef)
+    private UpdateResult createResult(String cmd, String sourceId, NodeRef sourceNodeRef, NodeRef destinationNodeRef)
     {
         UpdateResult result = new UpdateResult();
         result.setStatement(cmd);
+        if (sourceId != null)
+        {
+            result.setSourceId(sourceId);
+        }
         if (sourceNodeRef != null)
         {
             result.setSource(Utils.convertToReference(sourceNodeRef));
@@ -313,7 +317,7 @@ public class CMLUtil
             this.nodeService.addAspect(nodeRef, aspectQName, properties);
             
             // Create the result
-            results.add(createResult(ADD_ASPECT, nodeRef, nodeRef));
+            results.add(createResult(ADD_ASPECT, null, nodeRef, nodeRef));
         }        
     }
     
@@ -331,7 +335,7 @@ public class CMLUtil
             this.nodeService.removeAspect(nodeRef, aspectQName);
             
             // Create the result
-            results.add(createResult(REMOVE_ASPECT, nodeRef, nodeRef));
+            results.add(createResult(REMOVE_ASPECT, null, nodeRef, nodeRef));
         } 
     }
     
@@ -367,7 +371,7 @@ public class CMLUtil
             this.nodeService.setProperties(nodeRef, currentProps);
             
             // Get the result
-            results.add(createResult(UPDATE, nodeRef, nodeRef));
+            results.add(createResult(UPDATE, null, nodeRef, nodeRef));
         }        
     }
     
@@ -380,7 +384,7 @@ public class CMLUtil
             this.nodeService.deleteNode(nodeRef);
             
             // Create the result
-            results.add(createResult(DELETE, nodeRef, null));
+            results.add(createResult(DELETE, null, nodeRef, null));
         }
     }
     
@@ -408,7 +412,7 @@ public class CMLUtil
                 NodeRef newNodeRef = this.nodeService.moveNode(nodeToMove, destinationNodeRef, assocType, assocName).getChildRef();
                 
                 // Create the result
-                results.add(createResult(MOVE, nodeToMove, newNodeRef));
+                results.add(createResult(MOVE, null, nodeToMove, newNodeRef));
             }
         }
     }    
@@ -474,7 +478,7 @@ public class CMLUtil
                 NodeRef newNodeRef = this.copyService.copy(nodeToCopy, destinationNodeRef, assocType, assocName, copyChildren);
                 
                 // Create the result
-                results.add(createResult(COPY, nodeToCopy, newNodeRef));
+                results.add(createResult(COPY, null, nodeToCopy, newNodeRef));
             }
         }
         
@@ -504,7 +508,7 @@ public class CMLUtil
                 this.nodeService.addChild(nodeRef, whereNodeRef, assocType, assocName);
                 
                 // Create the result
-                results.add(createResult(ADD_CHILD, nodeRef, whereNodeRef));
+                results.add(createResult(ADD_CHILD, null, nodeRef, whereNodeRef));
             }
         }
     }    
@@ -520,7 +524,7 @@ public class CMLUtil
                 this.nodeService.removeChild(parentNodeRef, childNodeRef);
                 
                 // Create the result
-                results.add(createResult(REMOVE_CHILD, parentNodeRef, null));
+                results.add(createResult(REMOVE_CHILD, null, parentNodeRef, null));
             }
         }
         
@@ -540,7 +544,7 @@ public class CMLUtil
                     this.nodeService.createAssociation(fromNodeRef, toNodeRef, assocType);
                     
                     // Create the result
-                    results.add(createResult(CREATE_ASSOCIATION, fromNodeRef, toNodeRef));
+                    results.add(createResult(CREATE_ASSOCIATION, null, fromNodeRef, toNodeRef));
                 }
             }
         }        
@@ -560,7 +564,7 @@ public class CMLUtil
                     this.nodeService.removeAssociation(fromNodeRef, toNodeRef, assocType);
                     
                     // Create the result
-                    results.add(createResult(REMOVE_ASSOCIATION, fromNodeRef, toNodeRef));
+                    results.add(createResult(REMOVE_ASSOCIATION, null, fromNodeRef, toNodeRef));
                 }
             }
         }        
@@ -569,15 +573,22 @@ public class CMLUtil
     private class ExecutionContext
     {
         private Map<String, NodeRef> idMap = new HashMap<String, NodeRef>();
+        private Map<NodeRef, String> nodeRefMap = new HashMap<NodeRef, String>();
         
         public void addId(String id, NodeRef nodeRef)
         {
             this.idMap.put(id, nodeRef);
+            this.nodeRefMap.put(nodeRef, id);
         }
         
         public NodeRef getNodeRef(String id)
         {
             return this.idMap.get(id);
         }
+        
+        public String getId(NodeRef nodeRef)
+        {
+            return this.nodeRefMap.get(nodeRef);
+        }
     }
 }
diff --git a/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java b/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java
index 88836e3b25..39becd73ef 100644
--- a/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java
+++ b/source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java
@@ -265,6 +265,8 @@ public class RepositoryWebService extends AbstractWebService implements
             return queryResult;
         } catch (Throwable e)
         {
+            e.printStackTrace();
+            
             // rollback the transaction
             try
             {
diff --git a/source/wsdl/cml.xsd b/source/wsdl/cml.xsd
index cc465ae607..25f2414040 100644
--- a/source/wsdl/cml.xsd
+++ b/source/wsdl/cml.xsd
@@ -94,8 +94,8 @@
 				<xsd:complexType>
 					<xsd:sequence>
 						<xsd:choice>
-							<xsd:element name="from" type="cms:Reference"></xsd:element>
-							<xsd:element name="from_id" type="xsd:string"></xsd:element>
+							<xsd:element name="from" type="cms:Reference" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+							<xsd:element name="from_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 						</xsd:choice>
 						<xsd:group ref="cml:Where"></xsd:group>
 					</xsd:sequence>
@@ -159,31 +159,31 @@
 	
 	<xsd:group name="Where">
 		<xsd:choice>
-			<xsd:element name="where" type="cms:Predicate"></xsd:element>
-			<xsd:element name="where_id" type="xsd:string"></xsd:element>
+			<xsd:element name="where" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			<xsd:element name="where_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 		</xsd:choice>
 	</xsd:group>
 	
 	<xsd:group name="From">
 		<xsd:choice>
-			<xsd:element name="from" type="cms:Predicate"></xsd:element>
-			<xsd:element name="from_id" type="xsd:string"></xsd:element>
+			<xsd:element name="from" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			<xsd:element name="from_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 		</xsd:choice>
 	</xsd:group>
 
 	<xsd:group name="To">
 		<xsd:choice>
-			<xsd:element name="to" type="cms:Predicate"></xsd:element>
-			<xsd:element name="to_id" type="xsd:string"></xsd:element>
+			<xsd:element name="to" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			<xsd:element name="to_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 		</xsd:choice>
 	</xsd:group>
 
 	<xsd:group name="ToParent">
 		<xsd:choice>
-			<xsd:element name="to" type="cms:ParentReference"></xsd:element>
+			<xsd:element name="to" type="cms:ParentReference" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 			<xsd:sequence>
-				<xsd:element name="to_id" type="xsd:string"></xsd:element>
-				<xsd:group ref="cms:ChildAssociation"></xsd:group>
+				<xsd:element name="to_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+				<xsd:group ref="cms:ChildAssociation" maxOccurs="1" minOccurs="0" nillable="true"></xsd:group>
 			</xsd:sequence>
 		</xsd:choice>
 	</xsd:group>							
diff --git a/source/wsdl/repository-service.wsdl b/source/wsdl/repository-service.wsdl
index cd4b8020cc..24fcb93912 100644
--- a/source/wsdl/repository-service.wsdl
+++ b/source/wsdl/repository-service.wsdl
@@ -192,6 +192,7 @@
             <sequence>
                <element name="statement" type="xsd:string"/>
                <element name="updateCount" type="cms:ResultSet" nillable="true"/>
+               <element name="sourceId" type="xsd:string" nillable="true"/>
                <element name="source" type="cms:Reference" nillable="true"/>
                <element name="destination" type="cms:Reference" nillable="true"/>
             </sequence>
diff --git a/source/wsdl/types.xsd b/source/wsdl/types.xsd
index 894580ad8c..cf6f7f762f 100644
--- a/source/wsdl/types.xsd
+++ b/source/wsdl/types.xsd
@@ -243,8 +243,8 @@
 			<xsd:element name="nodes" type="cms:Reference" maxOccurs="unbounded" minOccurs="0" nillable="true">
 			</xsd:element>
 			<xsd:sequence>
-				<xsd:element name="store" type="cms:Store" minOccurs="0" nillable="true"></xsd:element>
-				<xsd:element name="query" type="cms:Query" minOccurs="0" nillable="true"></xsd:element>
+				<xsd:element name="store" type="cms:Store" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+				<xsd:element name="query" type="cms:Query" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 			</xsd:sequence>
 		</xsd:choice>
 	</xsd:complexType>