diff --git a/src/01/01/z2ui5_cl_core_srv_draft.clas.abap b/src/01/01/z2ui5_cl_core_srv_draft.clas.abap
index ad226524..1e50e8bd 100644
--- a/src/01/01/z2ui5_cl_core_srv_draft.clas.abap
+++ b/src/01/01/z2ui5_cl_core_srv_draft.clas.abap
@@ -3,7 +3,6 @@ CLASS z2ui5_cl_core_srv_draft DEFINITION
   CREATE PUBLIC.
 
   PUBLIC SECTION.
-
     TYPES ty_s_db TYPE z2ui5_t_01.
 
     METHODS count_entries
@@ -17,23 +16,22 @@ CLASS z2ui5_cl_core_srv_draft DEFINITION
 
     METHODS read_draft
       IMPORTING
-        !id           TYPE clike
+        id            TYPE clike
       RETURNING
         VALUE(result) TYPE ty_s_db.
 
     METHODS read_info
       IMPORTING
-        !id           TYPE clike
+        id            TYPE clike
       RETURNING
         VALUE(result) TYPE z2ui5_if_types=>ty_s_draft.
 
     METHODS cleanup.
 
   PROTECTED SECTION.
-
     METHODS read
       IMPORTING
-        !id            TYPE clike
+        id             TYPE clike
         check_load_app TYPE abap_bool DEFAULT abap_true
       RETURNING
         VALUE(result)  TYPE ty_s_db.
@@ -43,6 +41,7 @@ ENDCLASS.
 
 
 CLASS z2ui5_cl_core_srv_draft IMPLEMENTATION.
+
   METHOD cleanup.
 
     DATA(lv_four_hours_ago) = z2ui5_cl_util=>time_substract_seconds( time    = z2ui5_cl_util=>time_get_timestampl( )
@@ -58,18 +57,16 @@ CLASS z2ui5_cl_core_srv_draft IMPLEMENTATION.
     ASSERT draft-id IS NOT INITIAL.
 
     DATA(ls_db) = VALUE ty_s_db( id                = draft-id
-                                                      id_prev           = draft-id_prev
-                                                      id_prev_app       = draft-id_prev_app
-                                                      id_prev_app_stack = draft-id_prev_app_stack
-                                                      uname             = z2ui5_cl_util=>context_get_user_tech( )
-                                                      timestampl        = z2ui5_cl_util=>time_get_timestampl( )
-                                                      data              = model_xml ).
+                                 id_prev           = draft-id_prev
+                                 id_prev_app       = draft-id_prev_app
+                                 id_prev_app_stack = draft-id_prev_app_stack
+                                 timestampl        = z2ui5_cl_util=>time_get_timestampl( )
+                                 data              = model_xml ).
 
     MODIFY z2ui5_t_01 FROM @ls_db.
     IF sy-subrc <> 0.
       RAISE EXCEPTION TYPE z2ui5_cx_util_error
-        EXPORTING
-          val = `CREATE_OF_DRAFT_ENTRY_ON_DATABASE_FAILED`.
+        EXPORTING val = `CREATE_OF_DRAFT_ENTRY_ON_DATABASE_FAILED`.
     ENDIF.
     COMMIT WORK AND WAIT.
 
@@ -86,7 +83,7 @@ CLASS z2ui5_cl_core_srv_draft IMPLEMENTATION.
     ELSE.
 
       SELECT SINGLE id, id_prev, id_prev_app, id_prev_app_stack
-       FROM z2ui5_t_01
+        FROM z2ui5_t_01
         WHERE id = @id
         INTO CORRESPONDING FIELDS OF @result ##SUBRC_OK.
 
@@ -94,8 +91,7 @@ CLASS z2ui5_cl_core_srv_draft IMPLEMENTATION.
 
     IF sy-subrc <> 0.
       RAISE EXCEPTION TYPE z2ui5_cx_util_error
-        EXPORTING
-          val = `NO_DRAFT_ENTRY_OF_PREVIOUS_REQUEST_FOUND`.
+        EXPORTING val = `NO_DRAFT_ENTRY_OF_PREVIOUS_REQUEST_FOUND`.
     ENDIF.
 
   ENDMETHOD.
@@ -117,9 +113,9 @@ CLASS z2ui5_cl_core_srv_draft IMPLEMENTATION.
 
   METHOD count_entries.
 
-    SELECT COUNT( * )
-      FROM z2ui5_t_01
+    SELECT COUNT( * ) FROM z2ui5_t_01
       INTO @result.
 
   ENDMETHOD.
+
 ENDCLASS.
diff --git a/src/01/01/z2ui5_t_01.tabl.xml b/src/01/01/z2ui5_t_01.tabl.xml
index 43a27639..9cbcaf5c 100644
--- a/src/01/01/z2ui5_t_01.tabl.xml
+++ b/src/01/01/z2ui5_t_01.tabl.xml
@@ -8,6 +8,7 @@
     <TABCLASS>TRANSP</TABCLASS>
     <CLIDEP>X</CLIDEP>
     <DDTEXT>abap2UI5 - drafts</DDTEXT>
+    <MASTERLANG>E</MASTERLANG>
     <CONTFLAG>A</CONTFLAG>
     <EXCLASS>1</EXCLASS>
    </DD02V>
@@ -71,15 +72,6 @@
      <ADMINFIELD>0</ADMINFIELD>
      <COMPTYPE>E</COMPTYPE>
     </DD03P>
-    <DD03P>
-     <FIELDNAME>UNAME</FIELDNAME>
-     <ADMINFIELD>0</ADMINFIELD>
-     <INTTYPE>C</INTTYPE>
-     <INTLEN>000040</INTLEN>
-     <DATATYPE>CHAR</DATATYPE>
-     <LENG>000020</LENG>
-     <MASK>  CHAR</MASK>
-    </DD03P>
     <DD03P>
      <FIELDNAME>DATA</FIELDNAME>
      <ADMINFIELD>0</ADMINFIELD>