diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/ClassConverter.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/ClassConverter.java
index a848e9fc5..d49bb5690 100644
--- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/ClassConverter.java
+++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/ClassConverter.java
@@ -137,7 +137,7 @@ private void appendFields(Map<String, NativeMapping> nativeFieldGroupByJavaField
                               FieldMetadata field,
                               String javaField, String nativeField) {
 
-        Class<?> type = field.nativeField().getType();
+        Class<?> type = field.type();
         appendFields(nativeFieldGroupByJavaField, field, javaField, nativeField, type);
     }
 
diff --git a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/GenericFieldMetadata.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/GenericFieldMetadata.java
index 560f491c2..8113dd7fd 100644
--- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/GenericFieldMetadata.java
+++ b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/reflection/GenericFieldMetadata.java
@@ -92,7 +92,7 @@ private boolean hasFieldAnnotation(Class<?> annotation) {
     }
 
     public Class<?> getElementType() {
-        return (Class) ((ParameterizedType) nativeField()
+        return (Class<?>) ((ParameterizedType) nativeField()
                 .getGenericType())
                 .getActualTypeArguments()[0];
     }