diff --git a/src/zcl_excel_autofilter.clas.abap b/src/zcl_excel_autofilter.clas.abap
index 64aee95..d578f6a 100644
--- a/src/zcl_excel_autofilter.clas.abap
+++ b/src/zcl_excel_autofilter.clas.abap
@@ -8,7 +8,7 @@ CLASS zcl_excel_autofilter DEFINITION
   PUBLIC SECTION.
 
     TYPES tv_filter_rule TYPE string .
-    TYPES tv_logical_operator TYPE char3 .
+    TYPES tv_logical_operator TYPE c LENGTH 3 .
     TYPES:
       BEGIN OF ts_filter,
         column           TYPE zexcel_cell_column,
diff --git a/src/zcl_excel_data_validation.clas.abap b/src/zcl_excel_data_validation.clas.abap
index 181e68f..1d0a171 100644
--- a/src/zcl_excel_data_validation.clas.abap
+++ b/src/zcl_excel_data_validation.clas.abap
@@ -17,8 +17,8 @@ CLASS zcl_excel_data_validation DEFINITION
     DATA cell_row_to TYPE zexcel_cell_row .
     CONSTANTS c_type_custom TYPE zexcel_data_val_type VALUE 'custom'. "#EC NOTEXT
     CONSTANTS c_type_list TYPE zexcel_data_val_type VALUE 'list'. "#EC NOTEXT
-    DATA showerrormessage TYPE flag VALUE 'X'. "#EC NOTEXT .  .  .  .  .  .  .  .  .  . " .
-    DATA showinputmessage TYPE flag VALUE 'X'. "#EC NOTEXT .  .  .  .  .  .  .  .  .  . " .
+    DATA showerrormessage TYPE abap_bool VALUE 'X'. "#EC NOTEXT .  .  .  .  .  .  .  .  .  . " .
+    DATA showinputmessage TYPE abap_bool VALUE 'X'. "#EC NOTEXT .  .  .  .  .  .  .  .  .  . " .
     DATA type TYPE zexcel_data_val_type .
     DATA formula1 TYPE zexcel_validation_formula1 .
     DATA formula2 TYPE zexcel_validation_formula1 .
@@ -39,7 +39,7 @@ CLASS zcl_excel_data_validation DEFINITION
     CONSTANTS c_operator_lessthanorequal TYPE zexcel_data_val_operator VALUE 'lessThanOrEqual'. "#EC NOTEXT
     CONSTANTS c_operator_notbetween TYPE zexcel_data_val_operator VALUE 'notBetween'. "#EC NOTEXT
     CONSTANTS c_operator_notequal TYPE zexcel_data_val_operator VALUE 'notEqual'. "#EC NOTEXT
-    DATA showdropdown TYPE flag .
+    DATA showdropdown TYPE abap_bool .
     DATA errortitle TYPE string .
     DATA error TYPE string .
     DATA prompttitle TYPE string .
diff --git a/src/zexcel_alignment.dtel.xml b/src/zexcel_alignment.dtel.xml
index c5d630c..a79b0df 100644
--- a/src/zexcel_alignment.dtel.xml
+++ b/src/zexcel_alignment.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_ALIGNMENT</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>CHAR20</DOMNAME>
     <HEADLEN>09</HEADLEN>
     <SCRLEN1>09</SCRLEN1>
     <SCRLEN2>09</SCRLEN2>
@@ -16,7 +15,9 @@
     <SCRTEXT_M>Alignment</SCRTEXT_M>
     <SCRTEXT_L>Alignment</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>CHAR</DATATYPE>
+    <LENG>000020</LENG>
+    <OUTPUTLEN>000020</OUTPUTLEN>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_border.dtel.xml b/src/zexcel_border.dtel.xml
index 37b229e..fb335fa 100644
--- a/src/zexcel_border.dtel.xml
+++ b/src/zexcel_border.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_BORDER</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>CHAR20</DOMNAME>
     <HEADLEN>12</HEADLEN>
     <SCRLEN1>06</SCRLEN1>
     <SCRLEN2>12</SCRLEN2>
@@ -16,7 +15,9 @@
     <SCRTEXT_M>Border style</SCRTEXT_M>
     <SCRTEXT_L>Border style</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>CHAR</DATATYPE>
+    <LENG>000020</LENG>
+    <OUTPUTLEN>000020</OUTPUTLEN>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_data_val_error_style.dtel.xml b/src/zexcel_data_val_error_style.dtel.xml
index f946012..47bf72f 100644
--- a/src/zexcel_data_val_error_style.dtel.xml
+++ b/src/zexcel_data_val_error_style.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_DATA_VAL_ERROR_STYLE</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>CHAR20</DOMNAME>
     <HEADLEN>28</HEADLEN>
     <SCRLEN1>10</SCRLEN1>
     <SCRLEN2>20</SCRLEN2>
@@ -16,7 +15,9 @@
     <SCRTEXT_M>Data val. err. style</SCRTEXT_M>
     <SCRTEXT_L>Data validation error style</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>CHAR</DATATYPE>
+    <LENG>000020</LENG>
+    <OUTPUTLEN>000020</OUTPUTLEN>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_data_val_operator.dtel.xml b/src/zexcel_data_val_operator.dtel.xml
index 34b41a6..3f62363 100644
--- a/src/zexcel_data_val_operator.dtel.xml
+++ b/src/zexcel_data_val_operator.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_DATA_VAL_OPERATOR</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>CHAR20</DOMNAME>
     <HEADLEN>28</HEADLEN>
     <SCRLEN1>10</SCRLEN1>
     <SCRLEN2>20</SCRLEN2>
@@ -16,7 +15,9 @@
     <SCRTEXT_M>Data val. operator</SCRTEXT_M>
     <SCRTEXT_L>Data validation operator</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>CHAR</DATATYPE>
+    <LENG>000020</LENG>
+    <OUTPUTLEN>000020</OUTPUTLEN>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_data_val_type.dtel.xml b/src/zexcel_data_val_type.dtel.xml
index 26d91cf..a052c02 100644
--- a/src/zexcel_data_val_type.dtel.xml
+++ b/src/zexcel_data_val_type.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_DATA_VAL_TYPE</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>CHAR20</DOMNAME>
     <HEADLEN>20</HEADLEN>
     <SCRLEN1>10</SCRLEN1>
     <SCRLEN2>20</SCRLEN2>
@@ -16,7 +15,9 @@
     <SCRTEXT_M>Data validation type</SCRTEXT_M>
     <SCRTEXT_L>Data validation type</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>CHAR</DATATYPE>
+    <LENG>000020</LENG>
+    <OUTPUTLEN>000020</OUTPUTLEN>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_fill_type.dtel.xml b/src/zexcel_fill_type.dtel.xml
index de0ae22..de124b6 100644
--- a/src/zexcel_fill_type.dtel.xml
+++ b/src/zexcel_fill_type.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_FILL_TYPE</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>CHAR20</DOMNAME>
     <HEADLEN>09</HEADLEN>
     <SCRLEN1>09</SCRLEN1>
     <SCRLEN2>09</SCRLEN2>
@@ -16,7 +15,9 @@
     <SCRTEXT_M>Fill Type</SCRTEXT_M>
     <SCRTEXT_L>Fill Type</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>CHAR</DATATYPE>
+    <LENG>000020</LENG>
+    <OUTPUTLEN>000020</OUTPUTLEN>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_number_format.dtel.xml b/src/zexcel_number_format.dtel.xml
index dc2c8f0..99e747e 100644
--- a/src/zexcel_number_format.dtel.xml
+++ b/src/zexcel_number_format.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_NUMBER_FORMAT</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>STRING</DOMNAME>
     <HEADLEN>20</HEADLEN>
     <SCRLEN1>10</SCRLEN1>
     <SCRLEN2>15</SCRLEN2>
@@ -16,7 +15,7 @@
     <SCRTEXT_M>Number format</SCRTEXT_M>
     <SCRTEXT_L>Number format</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>STRG</DATATYPE>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_style_color_argb.dtel.xml b/src/zexcel_style_color_argb.dtel.xml
index db07afe..56be4bb 100644
--- a/src/zexcel_style_color_argb.dtel.xml
+++ b/src/zexcel_style_color_argb.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_STYLE_COLOR_ARGB</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>CHAR8</DOMNAME>
     <HEADLEN>10</HEADLEN>
     <SCRLEN1>10</SCRLEN1>
     <SCRLEN2>15</SCRLEN2>
@@ -16,7 +15,9 @@
     <SCRTEXT_M>Color ARGB</SCRTEXT_M>
     <SCRTEXT_L>Color ARGB</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>CHAR</DATATYPE>
+    <LENG>000008</LENG>
+    <OUTPUTLEN>000008</OUTPUTLEN>
    </DD04V>
   </asx:values>
  </asx:abap>
diff --git a/src/zexcel_validation_formula1.dtel.xml b/src/zexcel_validation_formula1.dtel.xml
index 2911f62..4560142 100644
--- a/src/zexcel_validation_formula1.dtel.xml
+++ b/src/zexcel_validation_formula1.dtel.xml
@@ -5,7 +5,6 @@
    <DD04V>
     <ROLLNAME>ZEXCEL_VALIDATION_FORMULA1</ROLLNAME>
     <DDLANGUAGE>E</DDLANGUAGE>
-    <DOMNAME>STRING</DOMNAME>
     <HEADLEN>20</HEADLEN>
     <SCRLEN1>10</SCRLEN1>
     <SCRLEN2>19</SCRLEN2>
@@ -16,7 +15,7 @@
     <SCRTEXT_M>Validation formula1</SCRTEXT_M>
     <SCRTEXT_L>Validation formula1</SCRTEXT_L>
     <DTELMASTER>E</DTELMASTER>
-    <REFKIND>D</REFKIND>
+    <DATATYPE>STRG</DATATYPE>
    </DD04V>
   </asx:values>
  </asx:abap>