diff --git a/src/00/03/z2ui5_cl_util.clas.abap b/src/00/03/z2ui5_cl_util.clas.abap
index c43024c3..2a04cfce 100644
--- a/src/00/03/z2ui5_cl_util.clas.abap
+++ b/src/00/03/z2ui5_cl_util.clas.abap
@@ -985,15 +985,16 @@ CLASS z2ui5_cl_util IMPLEMENTATION.
         ENDTRY.
     ENDTRY.
 
-    result = lo_struct->get_components( ).
+    DATA(comps) = lo_struct->get_components( ).
 
-    LOOP AT result REFERENCE INTO DATA(lr_comp)
-         WHERE as_include = abap_true.
+    LOOP AT comps REFERENCE INTO DATA(lr_comp).
 
-      DATA(lt_attri) = rtti_get_t_attri_by_include( lr_comp->type ).
-
-      DELETE result.
-      INSERT LINES OF lt_attri INTO TABLE result.
+      IF lr_comp->as_include = abap_false.
+        APPEND lr_comp->* TO result.
+      ELSE.
+        DATA(lt_attri) = rtti_get_t_attri_by_include( lr_comp->type ).
+        APPEND LINES OF lt_attri TO result.
+      ENDIF.
     ENDLOOP.
 
   ENDMETHOD.
diff --git a/src/02/z2ui5_cl_xml_view.clas.abap b/src/02/z2ui5_cl_xml_view.clas.abap
index 20806f54..45020e95 100644
--- a/src/02/z2ui5_cl_xml_view.clas.abap
+++ b/src/02/z2ui5_cl_xml_view.clas.abap
@@ -172,6 +172,14 @@ CLASS z2ui5_cl_xml_view DEFINITION
       RETURNING
         VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
 
+    METHODS overflow_toolbar_layout_data
+      IMPORTING
+        priority                   TYPE clike OPTIONAL
+        group                      TYPE clike OPTIONAL
+        closeOverflowOnInteraction TYPE clike OPTIONAL
+      RETURNING
+        VALUE(result)              TYPE REF TO z2ui5_cl_xml_view.
+
     METHODS table
       IMPORTING
         id                  TYPE clike OPTIONAL
@@ -11122,4 +11130,15 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD overflow_toolbar_layout_data.
+
+    result = _generic(
+        name   = `OverflowToolbarLayoutData`
+        t_prop = VALUE #(
+            ( n = `closeOverflowOnInteraction` v = z2ui5_cl_util=>boolean_abap_2_json( closeOverflowOnInteraction ) )
+            ( n = `group`                      v = group )
+            ( n = `priority`                   v = priority ) ) ).
+
+  ENDMETHOD.
+
 ENDCLASS.