diff --git a/KotlinServer/Enum.java.twig b/KotlinServer/Enum.java.twig
index 1e8b6c1..a493274 100644
--- a/KotlinServer/Enum.java.twig
+++ b/KotlinServer/Enum.java.twig
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonValue
  */
 enum class {{ name }}(val code: {{ utils.formatEnumValueType(valuesTypes) }}) {
 
-    {%- include 'blocks/enum/cases.twig' with { values: values } %}
+    {%- include 'blocks/enum/cases.twig' with { valuesTypes: valuesTypes, values: values } %}
 
     @JsonValue
     fun toValue() = code
diff --git a/KotlinServer/blocks/enum/cases.twig b/KotlinServer/blocks/enum/cases.twig
index 44325b6..19b2f39 100644
--- a/KotlinServer/blocks/enum/cases.twig
+++ b/KotlinServer/blocks/enum/cases.twig
@@ -6,5 +6,5 @@
      * {{ value.description }}
      */
     {%- endif %}
-    {{ value.nameUpperCaseWithUnderscope }}{%- if not (loop.last) %},{% else %};{% endif %}
+    {{ value.nameUpperCaseWithUnderscope }}({{ utils.formatEnumValue(valuesTypes, value) }}){%- if not (loop.last) %},{% else %};{% endif %}
 {%- endfor -%}
diff --git a/KotlinServer/blocks/enum/converters.twig b/KotlinServer/blocks/enum/converters.twig
deleted file mode 100644
index 7ffc9f2..0000000
--- a/KotlinServer/blocks/enum/converters.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-
-{%- if storable %}
-
-    @TypeConverter
-    @Nullable
-    public static String serialize(@Nullable final {{ name }} value) {
-        if (value == null) {
-            return null;
-        }
-        return value.name();
-    }
-
-    @TypeConverter
-    @Nullable
-    public static {{ name }} deserialize(@Nullable final String value) {
-        if (value == null) {
-            return null;
-        }
-        return {{ name }}.valueOf(value);
-    }
-
-{%- endif -%}
diff --git a/KotlinServer/utils.twig b/KotlinServer/utils.twig
index 13c1a4d..63166b9 100644
--- a/KotlinServer/utils.twig
+++ b/KotlinServer/utils.twig
@@ -33,4 +33,8 @@ List<{{ self.formatValueType(valueType.itemsType, true, true) }}>
 
 {% macro formatEnumValueType(valuesTypes) %}
 {%- if valuesTypes == "STRING" -%}String{%- elseif valuesTypes == "INT" -%}Int{%- endif -%}
+{% endmacro %}
+
+{% macro formatEnumValue(valuesTypes, value) %}
+{%- if valuesTypes == "STRING" -%}"{{ value.value }}"{%- elseif valuesTypes == "INT" -%}{{ value.value }}{%- endif -%}
 {% endmacro %}
\ No newline at end of file