diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
index 4bac3e5b14..f425fd245c 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/avm-common-SqlMap.xml
@@ -47,7 +47,7 @@
         <result property="floatValue" column="float_value" jdbcType="FLOAT" javaType="java.lang.Float"/>
         <result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/>
         <result property="stringValue" column="string_value" jdbcType="TEXT" javaType="java.lang.String"/>
-        <result property="serializable" column="serializable_value" jdbcType="BLOB"/>
+        <result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/>
     </resultMap>
     
     <resultMap id="result_AVMNode" class="AVMNode">
@@ -88,7 +88,7 @@
         <result property="floatValue" column="float_value" jdbcType="FLOAT" javaType="java.lang.Float"/>
         <result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/>
         <result property="stringValue" column="string_value" jdbcType="TEXT" javaType="java.lang.String"/>
-        <result property="serializable" column="serializable_value" jdbcType="BLOB"/>
+        <result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/>
     </resultMap>
     
     <resultMap id="result_AVMNodeAspect" class="AVMNodeAspect">
@@ -173,6 +173,34 @@
         <parameter property="pattern" jdbcType="VARCHAR" javaType="java.lang.String"/>
     </parameterMap>
     
+    <parameterMap id="parameter_NodePropertyPatternMap" class="AVMNodeProperty">
+        <parameter property="nodeId" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <parameter property="qnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <parameter property="actualType" jdbcType="INT" javaType="java.lang.Integer"/>
+        <parameter property="persistedType" jdbcType="INT" javaType="java.lang.Integer"/>
+        <parameter property="isMultiValued" jdbcType="BIT" javaType="java.lang.Boolean"/>
+        <parameter property="booleanValue" jdbcType="BIT" javaType="java.lang.Boolean"/>
+        <parameter property="longValue" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <parameter property="floatValue" jdbcType="FLOAT" javaType="java.lang.Float"/>
+        <parameter property="doubleValue" jdbcType="DOUBLE" javaType="java.lang.Double"/>
+        <parameter property="stringValue" jdbcType="TEXT" javaType="java.lang.String"/>
+        <parameter property="serializableValue" jdbcType="BLOB" javaType="java.io.Serializable"/>
+    </parameterMap>
+    
+    <parameterMap id="parameter_StorePropertyPatternMap" class="AVMStoreProperty">
+        <parameter property="avmStoreId" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <parameter property="qnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <parameter property="actualType" jdbcType="INT" javaType="java.lang.Integer"/>
+        <parameter property="persistedType" jdbcType="INT" javaType="java.lang.Integer"/>
+        <parameter property="isMultiValued" jdbcType="BIT" javaType="java.lang.Boolean"/>
+        <parameter property="booleanValue" jdbcType="BIT" javaType="java.lang.Boolean"/>
+        <parameter property="longValue" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <parameter property="floatValue" jdbcType="FLOAT" javaType="java.lang.Float"/>
+        <parameter property="doubleValue" jdbcType="DOUBLE" javaType="java.lang.Double"/>
+        <parameter property="stringValue" jdbcType="TEXT" javaType="java.lang.String"/>
+        <parameter property="serializableValue" jdbcType="BLOB" javaType="java.io.Serializable"/>
+    </parameterMap>
+    
     
     <!--                -->
     <!-- SQL Snippets   -->
@@ -195,7 +223,7 @@
     
     <sql id="insert_AVMStoreProperty_AutoIncrement">
         insert into avm_store_properties (avm_store_id, qname_id, actual_type_n, persisted_type_n, multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value)
-        values (#avmStoreId#, #qnameId#, #actualType#, #persistedType#, #isMultiValued#, #booleanValue#, #longValue#, #floatValue#, #doubleValue#, #stringValue#, #serializable#)
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     </sql>
     
     
@@ -228,9 +256,9 @@
         values (#versionRootId#, #md5sum#, #path#)
     </insert>
     
-    <insert id="insert_AVMNodeProperty">
+    <insert id="insert_AVMNodeProperty" parameterMap="parameter_NodePropertyPatternMap">
         insert into avm_node_properties (node_id, qname_id, actual_type_n, persisted_type_n, multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value)
-        values (#nodeId#, #qnameId#, #actualType#, #persistedType#, #isMultiValued#, #booleanValue#, #longValue#, #floatValue#, #doubleValue#, #stringValue#, #serializable#)
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     </insert>
     
     <!--                      -->
@@ -360,7 +388,7 @@
             float_value = #floatValue#,
             double_value = #doubleValue#,
             string_value = #stringValue#,
-            serializable_value = #serializable#
+            serializable_value = #serializableValue#
         where
             id = #id#
     </update>
@@ -573,7 +601,7 @@
             float_value = #floatValue#,
             double_value = #doubleValue#,
             string_value = #stringValue#,
-            serializable_value = #serializable#
+            serializable_value = #serializableValue#
         where
             node_id = #nodeId# and
             qname_id = #qnameId#
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
index d70a735bbd..417fa2ba1c 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
@@ -13,7 +13,7 @@
         </selectKey>
     </insert>
     
-        <insert id="insert_AVMStoreProperty" parameterClass="AVMStoreProperty">
+    <insert id="insert_AVMStoreProperty" parameterMap="parameter_StorePropertyPatternMap">
         <include refid="insert_AVMStoreProperty_AutoIncrement"/>
         <selectKey resultClass="long" keyProperty="id" type="post">
             KEY_COLUMN:GENERATED_KEY
diff --git a/source/java/org/alfresco/repo/domain/avm/AVMNodePropertyEntity.java b/source/java/org/alfresco/repo/domain/avm/AVMNodePropertyEntity.java
index f62c190908..409a62a125 100644
--- a/source/java/org/alfresco/repo/domain/avm/AVMNodePropertyEntity.java
+++ b/source/java/org/alfresco/repo/domain/avm/AVMNodePropertyEntity.java
@@ -25,7 +25,6 @@
 package org.alfresco.repo.domain.avm;
 
 import org.alfresco.repo.domain.PropertyValue;
-import org.alfresco.util.EqualsHelper;
 
 /**
  * Entity bean for <b>avm_node_properties</b> table.
@@ -45,7 +44,6 @@ public class AVMNodePropertyEntity extends PropertyValue
     {
     }
     
-    // TODO redo
     public AVMNodePropertyEntity(long nodeId, Long qnameId, PropertyValue value)
     {
         setNodeId(nodeId);
@@ -80,16 +78,6 @@ public class AVMNodePropertyEntity extends PropertyValue
         this.qnameId = qnameId;
     }
     
-    public void setSerializable(byte[] data)
-    {
-        setSerializableValue(data);
-    }
-    
-    public byte[] getSerializable()
-    {
-        return (byte[])getSerializableValue();
-    }
-    
     @Override
     public int hashCode()
     {
diff --git a/source/java/org/alfresco/repo/domain/avm/AVMStorePropertyEntity.java b/source/java/org/alfresco/repo/domain/avm/AVMStorePropertyEntity.java
index b5d0a1b604..f63999c43c 100644
--- a/source/java/org/alfresco/repo/domain/avm/AVMStorePropertyEntity.java
+++ b/source/java/org/alfresco/repo/domain/avm/AVMStorePropertyEntity.java
@@ -47,7 +47,6 @@ public class AVMStorePropertyEntity extends PropertyValue
         // default constructor
     }
     
-    // TODO redo
     public AVMStorePropertyEntity(long storeId, Long qnameId, PropertyValue value)
     {
         setAvmStoreId(storeId);
@@ -90,16 +89,6 @@ public class AVMStorePropertyEntity extends PropertyValue
         this.qnameId = qnameId;
     }
     
-    public void setSerializable(byte[] data)
-    {
-        setSerializableValue(data);
-    }
-    
-    public byte[] getSerializable()
-    {
-        return (byte[])getSerializableValue();
-    }
-    
     @Override
     public int hashCode()
     {
diff --git a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java
index 7b0cc85b90..634c57d00b 100644
--- a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java
@@ -449,7 +449,7 @@ public abstract class AbstractAVMNodeDAOImpl implements AVMNodeDAO
         }
         
         // Get the persistent ID for the QName
-        Pair<Long, QName> qnamePair = qnameDAO.getQName(qname);
+        Pair<Long, QName> qnamePair = qnameDAO.getOrCreateQName(qname);
         if (qnamePair != null)
         {
             Long qnameId  = qnamePair.getFirst();