diff --git a/src/zcl_excel_drawing.clas.abap b/src/zcl_excel_drawing.clas.abap
index bdf21e4..8253d12 100644
--- a/src/zcl_excel_drawing.clas.abap
+++ b/src/zcl_excel_drawing.clas.abap
@@ -44,7 +44,7 @@ CLASS zcl_excel_drawing DEFINITION
         VALUE(r_from_row) TYPE zexcel_cell_row .
     METHODS get_guid
       RETURNING
-        VALUE(ep_guid) TYPE guid_16 .
+        VALUE(ep_guid) TYPE zexcel_guid .
     METHODS get_height_emu_str
       RETURNING
         VALUE(r_height) TYPE string .
@@ -133,7 +133,7 @@ CLASS zcl_excel_drawing DEFINITION
     CONSTANTS c_media_source_www TYPE c VALUE 1.            "#EC NOTEXT
     CONSTANTS c_media_source_xstring TYPE c VALUE 0.        "#EC NOTEXT
     CONSTANTS c_media_source_mime TYPE c VALUE 2.           "#EC NOTEXT
-    DATA guid TYPE guid_16 .
+    DATA guid TYPE zexcel_guid .
     DATA media TYPE xstring .
     DATA media_key_www TYPE wwwdatatab .
     DATA media_name TYPE string .
@@ -147,7 +147,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_excel_drawing IMPLEMENTATION.
+CLASS ZCL_EXCEL_DRAWING IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -221,7 +221,7 @@ CLASS zcl_excel_drawing IMPLEMENTATION.
 
   METHOD get_media.
 
-    DATA: lv_language TYPE sylangu.
+    DATA: lv_language LIKE sy-langu.
     DATA: lt_bin_mime TYPE sdokcntbins.
     DATA: lt_mime          TYPE tsfmime,
           lv_filesize      TYPE i,
@@ -1053,7 +1053,7 @@ CLASS zcl_excel_drawing IMPLEMENTATION.
 
   METHOD set_media_mime.
 
-    DATA: lv_language TYPE sylangu.
+    DATA: lv_language LIKE sy-langu.
 
     io = ip_io.
     media_source = c_media_source_mime.
diff --git a/src/zcl_excel_obsolete_func_wrap.clas.abap b/src/zcl_excel_obsolete_func_wrap.clas.abap
index 96c8d8a..2829ca3 100644
--- a/src/zcl_excel_obsolete_func_wrap.clas.abap
+++ b/src/zcl_excel_obsolete_func_wrap.clas.abap
@@ -6,14 +6,14 @@ CLASS zcl_excel_obsolete_func_wrap DEFINITION
 
     CLASS-METHODS guid_create
       RETURNING
-        VALUE(rv_guid_16) TYPE guid_16 .
+        VALUE(rv_guid_16) TYPE zexcel_guid .
   PROTECTED SECTION.
   PRIVATE SECTION.
 ENDCLASS.
 
 
 
-CLASS zcl_excel_obsolete_func_wrap IMPLEMENTATION.
+CLASS ZCL_EXCEL_OBSOLETE_FUNC_WRAP IMPLEMENTATION.
 
 
   METHOD guid_create.
diff --git a/src/zexcel_guid.dtel.xml b/src/zexcel_guid.dtel.xml
new file mode 100644
index 0000000..8dafb35
--- /dev/null
+++ b/src/zexcel_guid.dtel.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_DTEL" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <DD04V>
+    <ROLLNAME>ZEXCEL_GUID</ROLLNAME>
+    <DDLANGUAGE>E</DDLANGUAGE>
+    <HEADLEN>16</HEADLEN>
+    <SCRLEN1>10</SCRLEN1>
+    <SCRLEN2>16</SCRLEN2>
+    <SCRLEN3>20</SCRLEN3>
+    <DDTEXT>GUID</DDTEXT>
+    <REPTEXT>GUID</REPTEXT>
+    <SCRTEXT_S>GUID</SCRTEXT_S>
+    <SCRTEXT_M>GUID</SCRTEXT_M>
+    <SCRTEXT_L>GUID</SCRTEXT_L>
+    <DTELMASTER>E</DTELMASTER>
+    <DATATYPE>RAW</DATATYPE>
+    <LENG>000016</LENG>
+    <OUTPUTLEN>000032</OUTPUTLEN>
+   </DD04V>
+  </asx:values>
+ </asx:abap>
+</abapGit>