diff --git a/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/datahandler/CassandraDataHandlerBase.java b/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/datahandler/CassandraDataHandlerBase.java
index dd12d025e..dd3e76b72 100644
--- a/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/datahandler/CassandraDataHandlerBase.java
+++ b/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/datahandler/CassandraDataHandlerBase.java
@@ -1421,7 +1421,12 @@ else if (type.getClass().getSimpleName().equals("SetType"))
                     serializer.validate(field);
 
                     Object finalValue = serializer.deserialize(field);
-                    PropertyAccessorHelper.set(entity, fieldToSet, finalValue);
+                    if (type.getClass().getSimpleName().equals("UTF8Type")){
+                        PropertyAccessorHelper.set(entity, fieldToSet, ((String) finalValue).getBytes());
+                    }
+                    else{
+                        PropertyAccessorHelper.set(entity, fieldToSet, finalValue);
+                    }
                 }
 
             }
diff --git a/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/schemamanager/CassandraDataTranslator.java b/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/schemamanager/CassandraDataTranslator.java
index 9b3804c52..f919e2366 100644
--- a/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/schemamanager/CassandraDataTranslator.java
+++ b/src/kundera-cassandra/cassandra-core/src/main/java/com/impetus/client/cassandra/schemamanager/CassandraDataTranslator.java
@@ -250,7 +250,9 @@ public static CassandraType get(String clazz)
      */
     public static CassandraType getCassandraDataTypeClass(Class clazz)
     {
-
+        if(clazz.isEnum()){
+            return CassandraType.STRING;
+        }
         return typeToClazz.get(clazz);
     }