diff --git a/orm/src/main/java/com/zfoo/orm/query/IQuery.java b/orm/src/main/java/com/zfoo/orm/query/IQuery.java
index 54b3cbf9..19223a82 100644
--- a/orm/src/main/java/com/zfoo/orm/query/IQuery.java
+++ b/orm/src/main/java/com/zfoo/orm/query/IQuery.java
@@ -20,8 +20,8 @@ import com.zfoo.orm.model.IEntity;
  *
  * @author godotg
  */
-public interface IQuery<PK extends Comparable<PK>, E extends IEntity<PK>> {
+public interface IQuery {
 
-    IQueryBuilder<PK, E> builder(Class<E> entityClazz);
+    <PK extends Comparable<PK>, E extends IEntity<PK>> IQueryBuilder<PK, E> builder(Class<E> entityClazz);
 
 }
diff --git a/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java b/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java
index d92c449e..5cf5feb8 100644
--- a/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java
+++ b/orm/src/main/java/com/zfoo/orm/query/MongodbQuery.java
@@ -18,10 +18,10 @@ import com.zfoo.orm.model.IEntity;
 /**
  * @author godotg
  */
-public class MongodbQuery<PK extends Comparable<PK>, E extends IEntity<PK>> implements IQuery<PK, E> {
+public class MongodbQuery implements IQuery {
 
     @Override
-    public IQueryBuilder<PK, E> builder(Class<E> entityClazz) {
+    public <PK extends Comparable<PK>, E extends IEntity<PK>> IQueryBuilder<PK, E> builder(Class<E> entityClazz) {
         return new MongoQueryBuilder<PK, E>(entityClazz);
     }