diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index 66e51cc9eb..3cc3a465fa 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -36,4 +36,13 @@
         </property>
     </bean>
     
+     <bean id="avmScript" parent="baseScriptImplementation" class="org.alfresco.repo.jscript.AVM">
+        <property name="scriptName">
+            <value>avm</value>
+        </property>        
+        <property name="serviceRegistry">
+            <ref bean="ServiceRegistry"/>
+        </property>
+    </bean>
+    
 </beans>
diff --git a/source/java/org/alfresco/repo/jscript/AVM.java b/source/java/org/alfresco/repo/jscript/AVM.java
index 22a83427a9..e1eaf3c578 100644
--- a/source/java/org/alfresco/repo/jscript/AVM.java
+++ b/source/java/org/alfresco/repo/jscript/AVM.java
@@ -19,27 +19,29 @@ package org.alfresco.repo.jscript;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
-import org.alfresco.service.cmr.avm.AVMService;
 import org.mozilla.javascript.Scriptable;
 
 /**
+ * Helper to access AVM nodes from a script context.
+ *  
  * @author Kevin Roast
  */
-public final class AVM implements Scopeable
+public final class AVM extends BaseScriptImplementation implements Scopeable
 {
+    /** Repository Service Registry */
+    private ServiceRegistry services;
+
     /** Root scope for this object */
     private Scriptable scope;
-    
-    private AVMService avmService;
-    private ServiceRegistry services;
-    
+
     /**
-     * Constructor
+     * Set the service registry
+     * 
+     * @param serviceRegistry the service registry
      */
-    public AVM(ServiceRegistry services)
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
     {
-        this.services = services;
-        this.avmService = services.getAVMService();
+      this.services = serviceRegistry;
     }
     
     /**
@@ -63,7 +65,7 @@ public final class AVM implements Scopeable
         if (store != null && store.length() != 0)
         {
            String rootPath = store + ':' + getWebappsFolderPath();
-           AVMNodeDescriptor nodeDesc = this.avmService.lookup(-1, rootPath);
+           AVMNodeDescriptor nodeDesc = this.services.getAVMService().lookup(-1, rootPath);
            if (nodeDesc != null)
            {
                rootNode = new AVMNode(AVMNodeConverter.ToNodeRef(-1, rootPath), this.services, null, this.scope);
@@ -84,7 +86,7 @@ public final class AVM implements Scopeable
         AVMNode node = null;
         if (path != null && path.length() != 0)
         {
-            AVMNodeDescriptor nodeDesc = this.avmService.lookup(-1, path);
+            AVMNodeDescriptor nodeDesc = this.services.getAVMService().lookup(-1, path);
             if (nodeDesc != null)
             {
                 node = new AVMNode(AVMNodeConverter.ToNodeRef(-1, path), this.services, null, this.scope);
diff --git a/source/java/org/alfresco/repo/jscript/AVMNode.java b/source/java/org/alfresco/repo/jscript/AVMNode.java
index e979791db2..25078c4b2c 100644
--- a/source/java/org/alfresco/repo/jscript/AVMNode.java
+++ b/source/java/org/alfresco/repo/jscript/AVMNode.java
@@ -27,6 +27,9 @@ import org.alfresco.service.cmr.repository.TemplateImageResolver;
 import org.mozilla.javascript.Scriptable;
 
 /**
+ * Represents a AVM specific node in the Script context. Provides specific implementations
+ * of AVM specific methods such as copy, move, rename etc. 
+ * 
  * @author Kevin Roast
  */
 public class AVMNode extends Node
diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptService.java b/source/java/org/alfresco/repo/jscript/RhinoScriptService.java
index 91ffbe6abb..400e610a81 100644
--- a/source/java/org/alfresco/repo/jscript/RhinoScriptService.java
+++ b/source/java/org/alfresco/repo/jscript/RhinoScriptService.java
@@ -235,7 +235,6 @@ public class RhinoScriptService implements ScriptService
             {
             	model.put(script.getScriptName(), script);
 			   }
-            model.put("avm", new AVM(services));
             
             // insert supplied object model into root of the default scope
             for (String key : model.keySet())