diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 343e57fe44..80af0dd4a4 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -98,6 +98,7 @@ public class AVMServiceTest extends TestCase
         {
             testCreateDirectory();
             fService.createFile("main:testdir", "testfile");
+            fService.createFile("main:/", "testfile2");
             ArrayList<String> toSnapshot = new ArrayList<String>();
             toSnapshot.add("main");
             fService.createSnapshot(toSnapshot);
diff --git a/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java b/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
index d4e72fd1bc..ad76ce1f77 100644
--- a/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
+++ b/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
@@ -69,7 +69,6 @@ public class LayeredDirectoryNode extends DirectoryNode implements Layered
                                                                 time,
                                                                 time,
                                                                 time);
-        repos.getSuperRepository().getSession().save(attrs);
         fData = new LayeredDirectoryNodeBeanImpl(repos.getSuperRepository().issueID(),
                                                  -1,
                                                  -1,
@@ -100,7 +99,6 @@ public class LayeredDirectoryNode extends DirectoryNode implements Layered
         attrs.setModDate(time);
         attrs.setAccessDate(time);
         attrs.setLastModifier("britt");
-        repos.getSuperRepository().getSession().save(attrs);
         fData = new LayeredDirectoryNodeBeanImpl(repos.getSuperRepository().issueID(),
                                                  -1,
                                                  -1,
@@ -133,7 +131,6 @@ public class LayeredDirectoryNode extends DirectoryNode implements Layered
         attrs.setModDate(time);
         attrs.setAccessDate(time);
         attrs.setLastModifier("britt");
-        repos.getSuperRepository().getSession().save(attrs);
         fData = new LayeredDirectoryNodeBeanImpl(repos.getSuperRepository().issueID(),
                                                  -1,
                                                  -1,
@@ -172,7 +169,6 @@ public class LayeredDirectoryNode extends DirectoryNode implements Layered
         attrs.setAccessDate(time);
         attrs.setCreator("britt");
         attrs.setLastModifier("britt");
-        repo.getSuperRepository().getSession().save(attrs);
         fData = new LayeredDirectoryNodeBeanImpl(repo.getSuperRepository().issueID(),
                                                  -1,
                                                  -1,
diff --git a/source/java/org/alfresco/repo/avm/LayeredFileNode.java b/source/java/org/alfresco/repo/avm/LayeredFileNode.java
index 2e922177aa..dcd65f79cd 100644
--- a/source/java/org/alfresco/repo/avm/LayeredFileNode.java
+++ b/source/java/org/alfresco/repo/avm/LayeredFileNode.java
@@ -59,7 +59,6 @@ public class LayeredFileNode extends FileNode implements Layered
         attrs.setAccessDate(time);
         attrs.setCreator("britt");
         attrs.setLastModifier("britt");
-        repo.getSuperRepository().getSession().save(attrs);
         fData = 
             new LayeredFileNodeBeanImpl(repo.getSuperRepository().issueID(),
                                         -1L,
@@ -97,7 +96,6 @@ public class LayeredFileNode extends FileNode implements Layered
         attrs.setAccessDate(time);
         attrs.setCreator("britt");
         attrs.setLastModifier("britt");
-        repos.getSuperRepository().getSession().save(attrs);
         fData = 
             new LayeredFileNodeBeanImpl(repos.getSuperRepository().issueID(),
                                         -1L,
@@ -126,7 +124,6 @@ public class LayeredFileNode extends FileNode implements Layered
                                                                 time,
                                                                 time,
                                                                 time);
-        repo.getSuperRepository().getSession().save(attrs);
         fData = new LayeredFileNodeBeanImpl(repo.getSuperRepository().issueID(),
                                             -1L,
                                             -1L,
diff --git a/source/java/org/alfresco/repo/avm/PlainDirectoryNode.java b/source/java/org/alfresco/repo/avm/PlainDirectoryNode.java
index aa539c62bf..0168c744b9 100644
--- a/source/java/org/alfresco/repo/avm/PlainDirectoryNode.java
+++ b/source/java/org/alfresco/repo/avm/PlainDirectoryNode.java
@@ -53,7 +53,6 @@ public class PlainDirectoryNode extends DirectoryNode
                                                                 time,
                                                                 time,
                                                                 time);
-        repo.getSuperRepository().getSession().save(attrs);
         fData = new PlainDirectoryNodeBeanImpl(repo.getSuperRepository().issueID(),
                                                repo.getLatestVersion(),
                                                0L,
@@ -95,7 +94,6 @@ public class PlainDirectoryNode extends DirectoryNode
         attrs.setAccessDate(time);
         attrs.setCreator("britt");
         attrs.setLastModifier("britt");
-        repos.getSuperRepository().getSession().save(attrs);
         fData = new PlainDirectoryNodeBeanImpl(repos.getSuperRepository().issueID(),
                                                -1,
                                                -1,
diff --git a/source/java/org/alfresco/repo/avm/PlainFileNode.java b/source/java/org/alfresco/repo/avm/PlainFileNode.java
index 8b05c84433..2b3f271169 100644
--- a/source/java/org/alfresco/repo/avm/PlainFileNode.java
+++ b/source/java/org/alfresco/repo/avm/PlainFileNode.java
@@ -58,7 +58,6 @@ public class PlainFileNode extends FileNode
                                                                 time,
                                                                 time,
                                                                 time);
-        repos.getSuperRepository().getSession().save(attrs);
         fData = new PlainFileNodeBeanImpl(repos.getSuperRepository().issueID(),
                                           -1,
                                           -1,
@@ -91,7 +90,6 @@ public class PlainFileNode extends FileNode
         attrs.setAccessDate(time);
         attrs.setCreator("britt");
         attrs.setLastModifier("britt");
-        repos.getSuperRepository().getSession().save(attrs);
         fData = new PlainFileNodeBeanImpl(repos.getSuperRepository().issueID(),
                                           -1,
                                           -1,
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
index e62e5d6993..0d0d1a708a 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
@@ -19,8 +19,6 @@
 		<version column="vers" name="vers" type="long"/>
 		<!-- BasicAttributes are attributes that pretty much all AVMNodes will
 			 have. -->
-		<many-to-one name="basicAttributes" column="basic_attrs"
-			class="BasicAttributesBeanImpl" unique="true" cascade="all"/>
 		<many-to-one name="ancestor" column="ancestor_id"
 			class="AVMNodeBeanImpl"/>
 		<!-- Nothing does anything with this yet. We'll need it for
@@ -46,6 +44,14 @@
 			 convenient one. -->
 		<property name="isNew" column="is_new" type="boolean"
 			not-null="true"/>
+		<component name="basicAttributes" class="BasicAttributesBeanImpl">
+			<property name="creator" type="string" not-null="true"/>
+			<property name="owner" type="string" not-null="true"/>
+			<property name="lastModifier" type="string" not-null="true"/>
+			<property name="createDate" type="long" not-null="true"/>
+			<property name="modDate" type="long" not-null="true"/>
+			<property name="accessDate" type="long" not-null="true"/>
+		</component>
 		<!-- Directories, two flavors. -->
 		<subclass name="DirectoryNodeBeanImpl" 
 		          proxy="DirectoryNodeBean" 
@@ -136,21 +142,6 @@
 			</subclass>
 		</subclass>
 	</class>
-	<!-- BasicAttributes are a glom of all the properties that (nearly) all filesystem like
-	     nodes have. -->
-	<class name="BasicAttributesBeanImpl" proxy="BasicAttributesBean"
-		lazy="true" optimistic-lock="version" table="basic_attributes">
-		<id name="id" type="long">
-			<generator class="native"></generator>
-		</id>
-		<version column="vers" name="vers" type="long"/>		
-		<property name="creator" type="string" not-null="true"/>
-		<property name="owner" type="string" not-null="true"/>
-		<property name="lastModifier" type="string" not-null="true"/>
-		<property name="createDate" type="long" not-null="true"/>
-		<property name="modDate" type="long" not-null="true"/>
-		<property name="accessDate" type="long" not-null="true"/>
-	</class>
 	<!-- Contents are objects to hang actual bytestreams off. They are explicitly reference
 	     counted. -->
 	<class table="contents" name="ContentBeanImpl" proxy="ContentBean"
diff --git a/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBean.java b/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBean.java
index 98868fa375..f44466bb76 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBean.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBean.java
@@ -9,28 +9,6 @@ package org.alfresco.repo.avm.hibernate;
  */
 public interface BasicAttributesBean
 {
-    /**
-     * Set the id.
-     * @param id
-     */
-    public void setId(Long id);
-    
-    /**
-     * Get the id.
-     * @return The id.
-     */
-    public Long getId();
-    
-    /**
-     * Set the version (for concurrency control.)
-     */
-    public void setVers(long vers);
-    
-    /**
-     * Get the version (for concurrency control.)
-     */
-    public long getVers();
-    
     /**
      * Set the creator of the node.
      * @param creator The creator to set.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBeanImpl.java b/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBeanImpl.java
index a7df5a008d..746c26b40a 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBeanImpl.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/BasicAttributesBeanImpl.java
@@ -10,16 +10,6 @@ package org.alfresco.repo.avm.hibernate;
  */
 public class BasicAttributesBeanImpl implements BasicAttributesBean
 {
-    /**
-     * The id.
-     */
-    private Long fID;
-    
-    /**
-     * The version for concurrency control.
-     */
-    private long fVers;
-    
     /**
      * The creator.
      */
@@ -50,22 +40,6 @@ public class BasicAttributesBeanImpl implements BasicAttributesBean
      */
     private long fAccessDate;
     
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.hibernate.BasicAttributesBean#getId()
-     */
-    public Long getId()
-    {
-        return fID;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.hibernate.BasicAttributesBean#setId(java.lang.Long)
-     */
-    public void setId(Long id)
-    {
-        fID = id;
-    }
-
     /**
      * Default constructor.
      */
@@ -111,22 +85,6 @@ public class BasicAttributesBeanImpl implements BasicAttributesBean
         fAccessDate = accessDate;
     }
     
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.hibernate.BasicAttributesBean#getVers()
-     */
-    public long getVers()
-    {
-        return fVers;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.avm.hibernate.BasicAttributesBean#setVers(long)
-     */
-    public void setVers(long vers)
-    {
-        fVers = vers;
-    }
-
     /* (non-Javadoc)
      * @see org.alfresco.repo.avm.hibernate.BasicAttributesBean#setCreator(java.lang.String)
      */
@@ -222,39 +180,4 @@ public class BasicAttributesBeanImpl implements BasicAttributesBean
     {
         return fAccessDate;
     }
-
-    // TODO This is probably wrong.
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (fID == null)
-        {
-            return false;
-        }
-        if (!(obj instanceof BasicAttributesBean))
-        {
-            return false;
-        }
-        return fID == ((BasicAttributesBean)obj).getId();
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode()
-    {
-        if (fID == null)
-        {
-            return 0;
-        }
-        return fID.hashCode();
-    }
 }
diff --git a/source/java/org/alfresco/repo/avm/hibernate/Issuer.java b/source/java/org/alfresco/repo/avm/hibernate/Issuer.java
index 02e1625fe0..50e2bcbbea 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/Issuer.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/Issuer.java
@@ -26,7 +26,7 @@ import org.hibernate.Session;
 public class Issuer
 {
     /**
-     * The name of this issuer.  Used as the primary key in it's
+     * The name of this issuer.  Used as the primary key in its
      * mapping.
      */
     private String fName;
@@ -122,4 +122,30 @@ public class Issuer
     {
         fVers = vers;
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (!(obj instanceof Issuer))
+        {
+            return false;
+        }
+        return fName.equals(((Issuer)obj).getName());
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode()
+    {
+        return fName.hashCode();
+    }
 }
diff --git a/source/java/org/alfresco/repo/avm/impl/AVMServiceImpl.java b/source/java/org/alfresco/repo/avm/impl/AVMServiceImpl.java
index ccfeafafa1..849f0aff86 100644
--- a/source/java/org/alfresco/repo/avm/impl/AVMServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/impl/AVMServiceImpl.java
@@ -87,8 +87,6 @@ public class AVMServiceImpl implements AVMService
             se.create(false, true);
             class HTxnCallback implements HibernateTxnCallback
             {
-                public InputStream in = null;
-                
                 public void perform(Session session)
                 {
                     new Issuer("node", 0L, session);
diff --git a/source/java/org/alfresco/repo/avm/impl/RepositoryImpl.java b/source/java/org/alfresco/repo/avm/impl/RepositoryImpl.java
index 4166f03d7e..f234ac0727 100644
--- a/source/java/org/alfresco/repo/avm/impl/RepositoryImpl.java
+++ b/source/java/org/alfresco/repo/avm/impl/RepositoryImpl.java
@@ -83,7 +83,6 @@ public class RepositoryImpl implements Repository
                                                                 time,
                                                                 time,
                                                                 time);
-        superRepo.getSession().save(attrs);
         PlainDirectoryNodeBean rootBean = 
             new PlainDirectoryNodeBeanImpl(fSuper.issueID(),
                                            fData.getNextVersionID(),