diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryLookupStrategy.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryLookupStrategy.java
index 5c21ab50d..a8f93c189 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryLookupStrategy.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryLookupStrategy.java
@@ -10,7 +10,7 @@ import org.springframework.util.StringUtils;
  * 
  * @author Oliver Gierke
  */
-public interface QueryLookupStrategy {
+public interface QueryLookupStrategy<Q extends QueryMethod> {
 
     public static enum Key {
 
@@ -40,5 +40,5 @@ public interface QueryLookupStrategy {
      * @param method
      * @return
      */
-    RepositoryQuery resolveQuery(QueryMethod method);
+    RepositoryQuery resolveQuery(Q method);
 }
\ No newline at end of file
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactoryBeanSupport.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactoryBeanSupport.java
index 6c6dbaa13..68e41a70c 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactoryBeanSupport.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactoryBeanSupport.java
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
 public abstract class RepositoryFactoryBeanSupport<T extends Repository<?, ?>>
         implements FactoryBean<T>, InitializingBean, BeanFactoryAware {
 
-    private RepositoryFactorySupport factory;
+    private RepositoryFactorySupport<?> factory;
 
     private Key queryLookupStrategyKey;
     private Class<? extends T> repositoryInterface;
@@ -102,8 +102,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<?, ?>>
      */
     public T getObject() {
 
-        return factory.getRepository(repositoryInterface,
-                customImplementation);
+        return factory.getRepository(repositoryInterface, customImplementation);
     }
 
 
@@ -141,8 +140,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<?, ?>>
 
         this.factory = createRepositoryFactory();
         this.factory.setQueryLookupStrategyKey(queryLookupStrategyKey);
-        this.factory.validate(repositoryInterface,
-                customImplementation);
+        this.factory.validate(repositoryInterface, customImplementation);
         this.factory.addDaoProxyPostProcessor(txPostProcessor);
     }
 
@@ -152,7 +150,7 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<?, ?>>
      * 
      * @return
      */
-    protected abstract RepositoryFactorySupport createRepositoryFactory();
+    protected abstract RepositoryFactorySupport<?> createRepositoryFactory();
 
 
     /*
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactorySupport.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactorySupport.java
index 99626d0ac..8cd18ac4f 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactorySupport.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryFactorySupport.java
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
  * 
  * @author Oliver Gierke
  */
-public abstract class RepositoryFactorySupport {
+public abstract class RepositoryFactorySupport<Q extends QueryMethod> {
 
     private QueryLookupStrategy.Key queryLookupStrategyKey;
 
@@ -117,8 +117,7 @@ public abstract class RepositoryFactorySupport {
         validate(repositoryInterface, customDaoImplementation);
 
         Class<?> domainClass = getDomainClass(repositoryInterface);
-        RepositorySupport<?, ?> target =
-                getTargetRepository(domainClass);
+        RepositorySupport<?, ?> target = getTargetRepository(domainClass);
 
         // Create proxy
         ProxyFactory result = new ProxyFactory();
@@ -137,8 +136,8 @@ public abstract class RepositoryFactorySupport {
 
 
     /**
-     * Create a {@link RepositorySupport} instance as backing for the
-     * query proxy.
+     * Create a {@link RepositorySupport} instance as backing for the query
+     * proxy.
      * 
      * @param <T>
      * @param domainClass
@@ -154,7 +153,7 @@ public abstract class RepositoryFactorySupport {
      * @param method
      * @return
      */
-    protected abstract QueryMethod getQueryMethod(Method method);
+    protected abstract Q getQueryMethod(Method method);
 
 
     /**
@@ -172,7 +171,7 @@ public abstract class RepositoryFactorySupport {
      * @param key can be {@literal null}
      * @return
      */
-    protected abstract QueryLookupStrategy getQueryLookupStrategy(Key key);
+    protected abstract QueryLookupStrategy<Q> getQueryLookupStrategy(Key key);
 
 
     /**
@@ -355,18 +354,17 @@ public abstract class RepositoryFactorySupport {
          * interface methods.
          */
         public QueryExecuterMethodInterceptor(Class<?> repositoryInterface,
-                Object customImplementation,
-                RepositorySupport<?, ?> target) {
+                Object customImplementation, RepositorySupport<?, ?> target) {
 
             this.repositoryInterface = repositoryInterface;
             this.customImplementation = customImplementation;
             this.target = target;
 
-            QueryLookupStrategy strategy =
+            QueryLookupStrategy<Q> strategy =
                     getQueryLookupStrategy(queryLookupStrategyKey);
 
             for (Method method : getFinderMethods(repositoryInterface)) {
-                QueryMethod queryMethod = getQueryMethod(method);
+                Q queryMethod = getQueryMethod(method);
                 queries.put(method, strategy.resolveQuery(queryMethod));
             }
         }