diff --git a/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/SelectQueryConverter.java b/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/SelectQueryConverter.java
index e4fcd9e08..ed9505c41 100644
--- a/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/SelectQueryConverter.java
+++ b/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/SelectQueryConverter.java
@@ -78,7 +78,7 @@ Function<QueryParser, ParseTree> getParserTree() {
         return QueryParser::select;
     }
 
-    private Sort sort(QueryParser.OrderNameContext context) {
+    private Sort<?> sort(QueryParser.OrderNameContext context) {
         String text = context.name().getText();
         Direction type = context.desc() == null? Direction.ASC: Direction.DESC;
         return Sort.of(text, type, false);
diff --git a/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/MethodSelectQuery.java b/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/MethodSelectQuery.java
index 3d3ccbb4d..0919acef7 100644
--- a/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/MethodSelectQuery.java
+++ b/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/MethodSelectQuery.java
@@ -27,9 +27,9 @@ final class MethodSelectQuery  implements SelectQuery {
 
     private final Where where;
 
-    private final List<Sort> sorts;
+    private final List<Sort<?>> sorts;
 
-    MethodSelectQuery(String entity, List<Sort> sorts, Where where) {
+    MethodSelectQuery(String entity, List<Sort<?>> sorts, Where where) {
         this.entity = entity;
         this.sorts = sorts;
         this.where = where;
@@ -61,7 +61,7 @@ public long limit() {
     }
 
     @Override
-    public List<Sort> orderBy() {
+    public List<Sort<?>> orderBy() {
         return Collections.unmodifiableList(sorts);
     }
 
diff --git a/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProvider.java b/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProvider.java
index 545b94745..3baf93a86 100644
--- a/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProvider.java
+++ b/jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProvider.java
@@ -25,7 +25,7 @@
 
 public final class SelectMethodQueryProvider extends AbstractMethodQueryProvider implements BiFunction<String, String, SelectQuery> {
 
-    private final List<Sort> sorts = new ArrayList<>();
+    private final List<Sort<?>> sorts = new ArrayList<>();
 
     @Override
     public SelectQuery apply(String query, String entity) {
diff --git a/jnosql-communication/jnosql-communication-query/src/test/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProviderTest.java b/jnosql-communication/jnosql-communication-query/src/test/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProviderTest.java
index f6f709860..97f0cf584 100644
--- a/jnosql-communication/jnosql-communication-query/src/test/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProviderTest.java
+++ b/jnosql-communication/jnosql-communication-query/src/test/java/org/eclipse/jnosql/communication/query/method/SelectMethodQueryProviderTest.java
@@ -461,14 +461,14 @@ private void checkOrderBy(String query, Direction direction, Direction direction
         SelectQuery selectQuery = queryProvider.apply(query, entity);
         assertNotNull(selectQuery);
         assertEquals(entity, selectQuery.entity());
-        List<Sort> sorts = selectQuery.orderBy();
+        List<Sort<?>> sorts = selectQuery.orderBy();
 
         assertEquals(2, sorts.size());
-        Sort sort = sorts.get(0);
+        Sort<?> sort = sorts.get(0);
         assertEquals("name", sort.property());
-        assertEquals(direction, sort.isAscending() == true ? Direction.ASC : Direction.DESC);
+        assertEquals(direction, sort.isAscending() ? Direction.ASC : Direction.DESC);
 
-        Sort sort2 = sorts.get(1);
+        Sort<?> sort2 = sorts.get(1);
         assertEquals("age", sort2.property());
 
         assertEquals(direction2, sort2.isAscending() ? Direction.ASC : Direction.DESC);
@@ -479,12 +479,12 @@ private void checkOrderBy(String query, Direction type) {
         SelectQuery selectQuery = queryProvider.apply(query, entity);
         assertNotNull(selectQuery);
         assertEquals(entity, selectQuery.entity());
-        List<Sort> sorts = selectQuery.orderBy();
+        List<Sort<?>> sorts = selectQuery.orderBy();
 
         assertEquals(1, sorts.size());
-        Sort sort = sorts.get(0);
+        Sort<?> sort = sorts.get(0);
         assertEquals("name", sort.property());
-        assertEquals(type, sort.isAscending() == true ? Direction.ASC : Direction.DESC);
+        assertEquals(type, sort.isAscending() ? Direction.ASC : Direction.DESC);
     }