diff --git a/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java b/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java
index aa98267..eea6585 100644
--- a/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java
+++ b/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java
@@ -29,6 +29,10 @@ public class DataSetToObjectConverter extends AbstractDataSetConverter implement
         // support type
         if(DataSet.class.equals(source) && !List.class.equals(target) && NexacroConverterHelper.isSupportedBean(target)) {
             return true;
+        } 
+        
+        if (DataSet.class.equals(source) && Map.class.isAssignableFrom(target)) {
+        	return true;
         }
         
         return false;
diff --git a/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java b/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java
index 961b4e0..b8843ea 100644
--- a/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java
+++ b/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java
@@ -30,6 +30,10 @@ public class ObjectToDataSetConverter extends AbstractDataSetConverter implement
     		return true;
     	}
     	
+		if (Map.class.isAssignableFrom(source) && DataSet.class.equals(target)) {
+			return true;
+		}
+    	
     	return false;
     }