diff --git a/src/zabapgit_object_serializing.prog.abap b/src/zabapgit_object_serializing.prog.abap
index 7c8aa5f11..c03e7ba86 100644
--- a/src/zabapgit_object_serializing.prog.abap
+++ b/src/zabapgit_object_serializing.prog.abap
@@ -27,8 +27,6 @@ INCLUDE zabapgit_object_nrob.
 INCLUDE zabapgit_object_para.
 INCLUDE zabapgit_object_pinf.
 INCLUDE zabapgit_object_prog.
-INCLUDE zabapgit_object_samc.
-INCLUDE zabapgit_object_sapc.
 INCLUDE zabapgit_object_sfbf.
 INCLUDE zabapgit_object_sfbs.
 INCLUDE zabapgit_object_sfpf.
diff --git a/src/zabapgit_object_wapa.prog.abap b/src/zabapgit_object_wapa.prog.abap
index 87ff46d9d..6c037947f 100644
--- a/src/zabapgit_object_wapa.prog.abap
+++ b/src/zabapgit_object_wapa.prog.abap
@@ -375,15 +375,19 @@ CLASS lcl_object_wapa IMPLEMENTATION.
       iv_ext   = lv_ext
       iv_data  = lv_content ).
 
-    rs_page-attributes = is_page.
+    lo_page->get_attrs(
+      IMPORTING
+        p_attrs = rs_page-attributes ).
 
     CLEAR: rs_page-attributes-author,
            rs_page-attributes-createdon,
            rs_page-attributes-changedby,
            rs_page-attributes-changedon,
+           rs_page-attributes-changetime,
            rs_page-attributes-implclass,
            rs_page-attributes-gendate,
-           rs_page-attributes-gentime.
+           rs_page-attributes-gentime,
+           rs_page-attributes-devclass.
 
   ENDMETHOD.