diff --git a/gradle.properties b/gradle.properties
index cc1bd447..9acce116 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ slf4jVersion = 1.6.4
 
 # Common libraries
 springVersion = 3.1.1.RELEASE
-springDataCommonsVersion = 1.3.0.RC1
+springDataCommonsVersion = 1.3.0.BUILD-SNAPSHOT
 gemfireVersion = 6.6.2
 
 # Testing
diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
index cafb940a..40f4d93b 100644
--- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
@@ -64,7 +64,7 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 		this.regions = new Regions(regions, this.context);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
 	 */
@@ -76,7 +76,7 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 		return new DefaultGemfireEntityInformation<T, ID>(entity);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryMetadata)
 	 */
@@ -84,7 +84,7 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	protected Object getTargetRepository(RepositoryMetadata metadata) {
 
-		GemfireEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainClass());
+		GemfireEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainType());
 		GemfireTemplate gemfireTemplate = getTemplate(metadata);
 
 		return new SimpleGemfireRepository(gemfireTemplate, entityInformation);
@@ -92,13 +92,13 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 
 	private GemfireTemplate getTemplate(RepositoryMetadata metadata) {
 
-		Class<?> domainClass = metadata.getDomainClass();
+		Class<?> domainClass = metadata.getDomainType();
 		Region<?, ?> region = regions.getRegion(domainClass);
 
 		GemfirePersistentEntity<?> entity = context.getPersistentEntity(domainClass);
 
 		Class<?> regionKeyType = region.getAttributes().getKeyConstraint();
-		Class<?> entityIdType = metadata.getIdClass();
+		Class<?> entityIdType = metadata.getIdType();
 
 		if (regionKeyType != null && entity.getIdProperty() != null) {
 			Assert.isTrue(regionKeyType.isAssignableFrom(entityIdType), String.format(
@@ -109,7 +109,7 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 		return new GemfireTemplate(region);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
 	 */
@@ -118,7 +118,7 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 		return SimpleGemfireRepository.class;
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key)
 	 */
diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java
index f0b7d64b..2fb1ea73 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java
@@ -46,7 +46,7 @@ public class GemfireQueryMethodUnitTests {
 	public void detectsAnnotatedQueryCorrectly() throws Exception {
 
 		GemfireMappingContext context = new GemfireMappingContext();
-		when(metadata.getDomainClass()).thenReturn((Class) Person.class);
+		when(metadata.getDomainType()).thenReturn((Class) Person.class);
 		when(metadata.getReturnedDomainClass(Mockito.any(Method.class))).thenReturn((Class) Person.class);
 
 		GemfireQueryMethod method = new GemfireQueryMethod(Sample.class.getMethod("annotated"), metadata, context);