diff --git a/src/main/java/org/gcube/informationsystem/types/TypeBinder.java b/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
index d9e953d..4b88e31 100644
--- a/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
+++ b/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
@@ -134,11 +134,17 @@ public class TypeBinder {
 		
 		logger.trace("Looking for property type type {}", method.getReturnType());
 		Class<?> type = method.getReturnType();
+		property.type = OType.EMBEDDED.getIntValue();
+		
 		if(Embedded.class.isAssignableFrom(type)){
 			property.linkedClass = getStaticStringFieldByName(type, NAME, type.getSimpleName());
 			property.type = OType.EMBEDDED.getIntValue();
 		}else if (Type.getTypeByClass(type)!=null) {
 			property.type = Type.getTypeByClass(type).getIntValue();
+			if(property.type > 9){
+				// TODO
+				// Get List/Set/Map generic arguments can be LinkedType or LinkedClass 
+			}
 		} else {
 			throw new RuntimeException("Type " + type.getSimpleName() + " not reconized");
 		}