diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/AssociationHandler.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/AssociationHandler.java
index 433e7c69c..91bc4a234 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/AssociationHandler.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/AssociationHandler.java
@@ -17,7 +17,6 @@
 package org.springframework.data.mapping;
 
 import org.springframework.data.mapping.model.Association;
-import org.springframework.data.mapping.model.PersistentProperty;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java
index ff47e6add..538f816ca 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java
@@ -29,7 +29,6 @@ import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;
-import java.math.BigInteger;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -60,7 +59,6 @@ public class BasicMappingConfigurationBuilder implements MappingConfigurationBui
     return false;
   }
 
-  @SuppressWarnings({"unchecked"})
   @Override
   public <T> PersistentEntity<T> createPersistentEntity(Class<T> type, MappingContext mappingContext) throws MappingConfigurationException {
     return new BasicPersistentEntity<T>(mappingContext, type);
@@ -74,10 +72,9 @@ public class BasicMappingConfigurationBuilder implements MappingConfigurationBui
     return true;
   }
 
-  @SuppressWarnings({"unchecked"})
   @Override
-  public PersistentProperty<?> createPersistentProperty(Field field, PropertyDescriptor descriptor) throws MappingConfigurationException {
-    return new BasicPersistentProperty(field.getName(), field.getType(), field, descriptor);
+  public <T> PersistentProperty<T> createPersistentProperty(Field field, PropertyDescriptor descriptor, Class<T> type) throws MappingConfigurationException {
+    return new BasicPersistentProperty<T>(field.getName(), type, field, descriptor);
   }
 
   @SuppressWarnings({"unchecked"})
@@ -112,7 +109,8 @@ public class BasicMappingConfigurationBuilder implements MappingConfigurationBui
               }
             } else {
               if (paramTypes[i] instanceof TypeVariable) {
-                Type[] bounds = ((TypeVariable) paramTypes[i]).getBounds();
+                @SuppressWarnings("rawtypes")
+				Type[] bounds = ((TypeVariable) paramTypes[i]).getBounds();
                 if (bounds.length > 0) {
                   targetType = (Class<?>) bounds[0];
                 }
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
index 25741d5f6..16aa94009 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
@@ -101,7 +101,7 @@ public class BasicMappingContext implements MappingContext, InitializingBean {
               PropertyDescriptor descriptor = descriptors.get(field.getName());
               if (builder.isPersistentProperty(field, descriptor)) {
                 ReflectionUtils.makeAccessible(field);
-                PersistentProperty<?> property = builder.createPersistentProperty(field, descriptor);
+                PersistentProperty<?> property = builder.createPersistentProperty(field, descriptor, field.getType());
                 property.setOwner(entity);
                 entity.addPersistentProperty(property);
                 if (builder.isAssociation(field, descriptor)) {
@@ -184,13 +184,12 @@ public class BasicMappingContext implements MappingContext, InitializingBean {
     this.builder = builder;
   }
 
-  @SuppressWarnings({"unchecked"})
   @Override
   public boolean isPersistentEntity(Object value) {
     if (null != value) {
-      Class clazz;
+      Class<?> clazz;
       if (value instanceof Class) {
-        clazz = ((Class) value);
+        clazz = ((Class<?>) value);
       } else {
         clazz = value.getClass();
       }
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentEntity.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentEntity.java
index 1e96400af..f66e12047 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentEntity.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentEntity.java
@@ -25,7 +25,7 @@ import java.util.Map;
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
-public class BasicPersistentEntity<T> implements PersistentEntity {
+public class BasicPersistentEntity<T> implements PersistentEntity<T> {
 
   protected final Class<T> type;
   protected PreferredConstructor<T> preferredConstructor;
@@ -41,12 +41,12 @@ public class BasicPersistentEntity<T> implements PersistentEntity {
   }
 
   @Override
-  public PreferredConstructor getPreferredConstructor() {
+  public PreferredConstructor<T> getPreferredConstructor() {
     return preferredConstructor;
   }
 
   @Override
-  public void setPreferredConstructor(PreferredConstructor constructor) {
+  public void setPreferredConstructor(PreferredConstructor<T> constructor) {
     this.preferredConstructor = constructor;
   }
 
@@ -61,7 +61,7 @@ public class BasicPersistentEntity<T> implements PersistentEntity {
   }
 
   @Override
-  public void setIdProperty(PersistentProperty property) {
+  public void setIdProperty(PersistentProperty<?> property) {
     idProperty = property;
   }
 
@@ -71,7 +71,7 @@ public class BasicPersistentEntity<T> implements PersistentEntity {
   }
 
   @Override
-  public void addPersistentProperty(PersistentProperty property) {
+  public void addPersistentProperty(PersistentProperty<?> property) {
     persistentProperties.put(property.getName(), property);
   }
 
@@ -85,7 +85,7 @@ public class BasicPersistentEntity<T> implements PersistentEntity {
     associations.put(association.getInverse().getName(), association);
   }
 
-  public PersistentProperty getPersistentProperty(String name) {
+  public PersistentProperty<?> getPersistentProperty(String name) {
     return persistentProperties.get(name);
   }
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/IllegalMappingException.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/IllegalMappingException.java
index e3094bc88..eacae59f7 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/IllegalMappingException.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/IllegalMappingException.java
@@ -22,7 +22,12 @@ package org.springframework.data.mapping.model;
  */
 public class IllegalMappingException extends RuntimeException {
 
-  public IllegalMappingException(String s, Throwable throwable) {
+  /**
+   * 
+   */
+	private static final long serialVersionUID = 1L;
+
+public IllegalMappingException(String s, Throwable throwable) {
     super(s, throwable);
   }
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java
index 5cd137f83..da20bad6e 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java
@@ -30,9 +30,9 @@ public interface MappingConfigurationBuilder {
 
   boolean isPersistentProperty(Field field, PropertyDescriptor descriptor) throws MappingConfigurationException;
 
-  PersistentProperty<?> createPersistentProperty(Field field, PropertyDescriptor descriptor) throws MappingConfigurationException;
+  <T> PersistentProperty<T> createPersistentProperty(Field field, PropertyDescriptor descriptor, Class<T> type) throws MappingConfigurationException;
 
-  <T> PreferredConstructor<?> getPreferredConstructor(Class<T> clazz) throws MappingConfigurationException;
+  <T> PreferredConstructor<T> getPreferredConstructor(Class<T> clazz) throws MappingConfigurationException;
 
   boolean isAssociation(Field field, PropertyDescriptor descriptor) throws MappingConfigurationException;
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationException.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationException.java
index 09273426f..e8253dcb8 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationException.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationException.java
@@ -20,7 +20,12 @@ package org.springframework.data.mapping.model;
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MappingConfigurationException extends Throwable {
-  public MappingConfigurationException(String s) {
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+public MappingConfigurationException(String s) {
     super(s);
   }
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingException.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingException.java
index 20cb6864a..88af5f5da 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingException.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingException.java
@@ -20,7 +20,13 @@ package org.springframework.data.mapping.model;
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MappingException extends RuntimeException {
-  public MappingException(String s) {
+  
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public MappingException(String s) {
     super(s);
   }
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java
index 6b208cc7c..8f0bcce0e 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java
@@ -17,14 +17,17 @@
 package org.springframework.data.mapping.model;
 
 /**
- * Created by IntelliJ IDEA.
- * User: jbrisbin
- * Date: 2/25/11
- * Time: 9:07 AM
- * To change this template use File | Settings | File Templates.
+ * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MappingInstantiationException extends RuntimeException {
-  public MappingInstantiationException(String s, Throwable throwable) {
+  
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public MappingInstantiationException(String s, Throwable throwable) {
     super(s, throwable);
   }
+	
 }
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PersistentEntity.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PersistentEntity.java
index 97dc0ab13..c9c6e7077 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PersistentEntity.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PersistentEntity.java
@@ -24,7 +24,7 @@ public interface PersistentEntity<T> extends InitializingBean {
 
   PreferredConstructor<T> getPreferredConstructor();
 
-  void setPreferredConstructor(PreferredConstructor constructor);
+  void setPreferredConstructor(PreferredConstructor<T> constructor);
 
   /**
    * Returns the identity of the instance
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PreferredConstructor.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PreferredConstructor.java
index d66c6ee2f..0f26fc6d6 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PreferredConstructor.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/PreferredConstructor.java
@@ -33,7 +33,6 @@ public class PreferredConstructor<T> {
 
   public PreferredConstructor(Constructor<T> constructor) {
     this.constructor = constructor;
-    this.parameters = parameters;
   }
 
   public Constructor<T> getConstructor() {