diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java b/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
index 867e172594..a72815381f 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
@@ -447,4 +447,36 @@ public class AVMRemoteLocal implements AVMRemote
     {
         fService.renameStore(sourceName, destName);
     }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#addAspect(java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public void addAspect(String path, QName aspectName) 
+    {
+        fService.addAspect(path, aspectName);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#getAspects(int, java.lang.String)
+     */
+    public List<QName> getAspects(int version, String path) 
+    {
+        return fService.getAspects(version, path);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#hasAspect(int, java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public boolean hasAspect(int version, String path, QName aspectName) 
+    {
+        return fService.hasAspect(version, path, aspectName);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#removeAspect(java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public void removeAspect(String path, QName aspectName) 
+    {
+        fService.removeAspect(path, aspectName);
+    }
 }
diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
index 38d77b07d4..6c052c4333 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
@@ -963,4 +963,40 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
         fAuthService.validate(ticket);
         fAVMService.renameStore(sourceName, destName);
     }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemoteTransport#addAspect(java.lang.String, java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public void addAspect(String ticket, String path, QName aspectName) 
+    {
+        fAuthService.validate(ticket);
+        fAVMService.addAspect(path, aspectName);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemoteTransport#getAspects(java.lang.String, int, java.lang.String)
+     */
+    public List<QName> getAspects(String ticket, int version, String path) 
+    {
+        fAuthService.validate(ticket);
+        return fAVMService.getAspects(version, path);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemoteTransport#hasAspect(java.lang.String, int, java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public boolean hasAspect(String ticket, int version, String path, QName aspectName) 
+    {
+        fAuthService.validate(ticket);
+        return fAVMService.hasAspect(version, path, aspectName);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemoteTransport#removeAspect(java.lang.String, java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public void removeAspect(String ticket, String path, QName aspectName) 
+    {
+        fAuthService.validate(ticket);
+        fAVMService.removeAspect(path, aspectName);
+    }
 }
diff --git a/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java b/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
index fb330ddda0..a875abf89b 100644
--- a/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
+++ b/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
@@ -451,4 +451,36 @@ public class AVMRemoteImpl implements AVMRemote
     {
         fTransport.renameStore(ClientTicketHolder.GetTicket(), sourceName, destName);
     }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#addAspect(java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public void addAspect(String path, QName aspectName) 
+    {
+        fTransport.addAspect(ClientTicketHolder.GetTicket(), path, aspectName);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#getAspects(int, java.lang.String)
+     */
+    public List<QName> getAspects(int version, String path) 
+    {
+        return fTransport.getAspects(ClientTicketHolder.GetTicket(), version, path);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#hasAspect(int, java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public boolean hasAspect(int version, String path, QName aspectName) 
+    {
+        return fTransport.hasAspect(ClientTicketHolder.GetTicket(), version, path, aspectName);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.remote.AVMRemote#removeAspect(java.lang.String, org.alfresco.service.namespace.QName)
+     */
+    public void removeAspect(String path, QName aspectName) 
+    {
+        fTransport.removeAspect(ClientTicketHolder.GetTicket(), path, aspectName);
+    }
 }
diff --git a/source/java/org/alfresco/service/cmr/remote/AVMRemote.java b/source/java/org/alfresco/service/cmr/remote/AVMRemote.java
index 03b1e08804..8bd30ab4cf 100644
--- a/source/java/org/alfresco/service/cmr/remote/AVMRemote.java
+++ b/source/java/org/alfresco/service/cmr/remote/AVMRemote.java
@@ -25,7 +25,9 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMExistsException;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
 import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avm.LayeringDescriptor;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
@@ -405,4 +407,40 @@ public interface AVMRemote
      * @param destName The new name.
      */
     public void renameStore(String sourceName, String destName);
+
+    /**
+     * Add an aspect to an AVM node.
+     * @param path The path to the node.
+     * @param aspectName The QName of the aspect.
+     * @throws AVMNotFoundException
+     * @throws AVMExistsException
+     */
+    public void addAspect(String path, QName aspectName);
+    
+    /**
+     * Get all the aspects on an AVM node.
+     * @param version The version to look under.
+     * @param path The path to the node.
+     * @return A List of the QNames of the aspects.
+     * @throws AVMNotFoundException   
+     */
+    public List<QName> getAspects(int version, String path);
+    
+    /**
+     * Remove an aspect and its properties from a node.
+     * @param path The path to the node.
+     * @param aspectName The name of the aspect.
+     * @throws AVMNotFoundException
+     */
+    public void removeAspect(String path, QName aspectName);
+    
+    /**
+     * Does a node have a particular aspect.
+     * @param version The version to look under.
+     * @param path The path to the node.
+     * @param aspectName The aspect name to check.
+     * @return Whether the given node has the given aspect.
+     * @throws AVMNotFoundException
+     */
+    public boolean hasAspect(int version, String path, QName aspectName);
 }
diff --git a/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java b/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
index 5a095c6370..47c09f38f8 100644
--- a/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
+++ b/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
@@ -9,7 +9,9 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMExistsException;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
 import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avm.LayeringDescriptor;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
@@ -424,4 +426,39 @@ public interface AVMRemoteTransport
      * @param destName The new name.
      */
     public void renameStore(String ticket, String sourceName, String destName);
+    /**
+     * Add an aspect to an AVM node.
+     * @param path The path to the node.
+     * @param aspectName The QName of the aspect.
+     * @throws AVMNotFoundException
+     * @throws AVMExistsException
+     */
+    public void addAspect(String ticket, String path, QName aspectName);
+    
+    /**
+     * Get all the aspects on an AVM node.
+     * @param version The version to look under.
+     * @param path The path to the node.
+     * @return A List of the QNames of the aspects.
+     * @throws AVMNotFoundException   
+     */
+    public List<QName> getAspects(String ticket, int version, String path);
+    
+    /**
+     * Remove an aspect and its properties from a node.
+     * @param path The path to the node.
+     * @param aspectName The name of the aspect.
+     * @throws AVMNotFoundException
+     */
+    public void removeAspect(String ticket, String path, QName aspectName);
+    
+    /**
+     * Does a node have a particular aspect.
+     * @param version The version to look under.
+     * @param path The path to the node.
+     * @param aspectName The aspect name to check.
+     * @return Whether the given node has the given aspect.
+     * @throws AVMNotFoundException
+     */
+    public boolean hasAspect(String ticket, int version, String path, QName aspectName);
 }