diff --git a/src/json/zcl_abapgit_ajson.clas.testclasses.abap b/src/json/zcl_abapgit_ajson.clas.testclasses.abap
index 1c1179e92..d11a7ebf0 100644
--- a/src/json/zcl_abapgit_ajson.clas.testclasses.abap
+++ b/src/json/zcl_abapgit_ajson.clas.testclasses.abap
@@ -1329,7 +1329,7 @@ CLASS ltcl_json_to_abap DEFINITION
         a TYPE string,
         b TYPE i,
       END OF ty_struc,
-      tty_struc TYPE STANDARD TABLE OF ty_struc WITH DEFAULT KEY,
+      tty_struc TYPE STANDARD TABLE OF ty_struc WITH KEY a,
       tty_struc_sorted TYPE SORTED TABLE OF ty_struc WITH UNIQUE KEY a,
       tty_struc_hashed TYPE HASHED TABLE OF ty_struc WITH UNIQUE KEY a,
       BEGIN OF ty_complex,
@@ -2352,7 +2352,7 @@ CLASS ltcl_writer_test IMPLEMENTATION.
     DATA lo_nodes TYPE REF TO lcl_nodes_helper.
     DATA lo_cut TYPE REF TO zcl_abapgit_ajson.
     DATA li_writer TYPE REF TO zif_abapgit_ajson.
-    DATA lt_tab TYPE HASHED TABLE OF string WITH UNIQUE DEFAULT KEY.
+    DATA lt_tab TYPE HASHED TABLE OF string WITH UNIQUE KEY table_line.
 
     lo_cut = zcl_abapgit_ajson=>create_empty( ).
     li_writer = lo_cut.
@@ -2387,7 +2387,7 @@ CLASS ltcl_writer_test IMPLEMENTATION.
         INCLUDE TYPE ty_include.
     TYPES: dat TYPE xstring,
       END OF ty_struct,
-      ty_tab TYPE STANDARD TABLE OF ty_struct WITH DEFAULT KEY.
+      ty_tab TYPE STANDARD TABLE OF ty_struct WITH KEY str.
 
     DATA lo_nodes TYPE REF TO lcl_nodes_helper.
     DATA li_cut TYPE REF TO zif_abapgit_ajson.
@@ -3237,7 +3237,7 @@ CLASS ltcl_integrated DEFINITION
         start TYPE ty_loc,
         end TYPE ty_loc,
       END OF ty_issue,
-      tt_issues TYPE STANDARD TABLE OF ty_issue WITH DEFAULT KEY,
+      tt_issues TYPE STANDARD TABLE OF ty_issue WITH KEY message key,
       BEGIN OF ty_target,
         string TYPE string,
         number TYPE i,
@@ -3602,7 +3602,7 @@ CLASS ltcl_abap_to_json DEFINITION
         c TYPE abap_bool,
         d TYPE xsdboolean,
       END OF ty_struc,
-      tt_struc TYPE STANDARD TABLE OF ty_struc WITH DEFAULT KEY,
+      tt_struc TYPE STANDARD TABLE OF ty_struc WITH KEY a,
       BEGIN OF ty_struc_complex.
         INCLUDE TYPE ty_struc.
     TYPES:
diff --git a/src/json/zcx_abapgit_ajson_error.clas.abap b/src/json/zcx_abapgit_ajson_error.clas.abap
index a573370bf..c51e9b749 100644
--- a/src/json/zcx_abapgit_ajson_error.clas.abap
+++ b/src/json/zcx_abapgit_ajson_error.clas.abap
@@ -67,7 +67,7 @@ ENDCLASS.
 CLASS zcx_abapgit_ajson_error IMPLEMENTATION.
 
 
-  method CONSTRUCTOR.
+method CONSTRUCTOR.
 CALL METHOD SUPER->CONSTRUCTOR
 EXPORTING
 PREVIOUS = PREVIOUS
@@ -85,7 +85,7 @@ if textid is initial.
 else.
   IF_T100_MESSAGE~T100KEY = TEXTID.
 endif.
-  endmethod.
+endmethod.
 
 
 method raise.
diff --git a/src/json/zcx_abapgit_ajson_error.clas.xml b/src/json/zcx_abapgit_ajson_error.clas.xml
index 43fe5c9e8..3346cd788 100644
--- a/src/json/zcx_abapgit_ajson_error.clas.xml
+++ b/src/json/zcx_abapgit_ajson_error.clas.xml
@@ -14,33 +14,6 @@
     <MSG_ID>SY</MSG_ID>
     <WITH_UNIT_TESTS>X</WITH_UNIT_TESTS>
    </VSEOCLASS>
-   <DESCRIPTIONS>
-    <SEOCOMPOTX>
-     <CMPNAME>A1</CMPNAME>
-     <LANGU>E</LANGU>
-     <DESCRIPT>Message Variable</DESCRIPT>
-    </SEOCOMPOTX>
-    <SEOCOMPOTX>
-     <CMPNAME>A2</CMPNAME>
-     <LANGU>E</LANGU>
-     <DESCRIPT>Message Variable</DESCRIPT>
-    </SEOCOMPOTX>
-    <SEOCOMPOTX>
-     <CMPNAME>A3</CMPNAME>
-     <LANGU>E</LANGU>
-     <DESCRIPT>Message Variable</DESCRIPT>
-    </SEOCOMPOTX>
-    <SEOCOMPOTX>
-     <CMPNAME>A4</CMPNAME>
-     <LANGU>E</LANGU>
-     <DESCRIPT>Message Variable</DESCRIPT>
-    </SEOCOMPOTX>
-    <SEOCOMPOTX>
-     <CMPNAME>CONSTRUCTOR</CMPNAME>
-     <LANGU>E</LANGU>
-     <DESCRIPT>CONSTRUCTOR</DESCRIPT>
-    </SEOCOMPOTX>
-   </DESCRIPTIONS>
   </asx:values>
  </asx:abap>
 </abapGit>
diff --git a/src/json/zif_abapgit_ajson_filter.intf.abap b/src/json/zif_abapgit_ajson_filter.intf.abap
index c63cd8ed3..93d927415 100644
--- a/src/json/zif_abapgit_ajson_filter.intf.abap
+++ b/src/json/zif_abapgit_ajson_filter.intf.abap
@@ -1,7 +1,7 @@
 INTERFACE zif_abapgit_ajson_filter
   PUBLIC.
 
-  TYPES ty_filter_tab TYPE STANDARD TABLE OF REF TO zif_abapgit_ajson_filter WITH DEFAULT KEY.
+  TYPES ty_filter_tab TYPE STANDARD TABLE OF REF TO zif_abapgit_ajson_filter WITH KEY table_line.
   TYPES ty_visit_type TYPE i.
 
   CONSTANTS: