diff --git a/src/objects/core/zcl_abapgit_file_deserialize.clas.abap b/src/objects/core/zcl_abapgit_file_deserialize.clas.abap
index 242d9686f..65d7c43d9 100644
--- a/src/objects/core/zcl_abapgit_file_deserialize.clas.abap
+++ b/src/objects/core/zcl_abapgit_file_deserialize.clas.abap
@@ -214,6 +214,9 @@ CLASS zcl_abapgit_file_deserialize IMPLEMENTATION.
           DELETE lt_requires WHERE obj_type <> 'IASP'
             AND obj_type <> 'PROG'
             AND obj_type <> 'IARP'.
+        WHEN 'IDOC' OR 'IEXT'.
+          lt_requires = lt_items.
+          DELETE lt_requires WHERE obj_type <> 'TABL'.
         WHEN 'DCLS'.
           lt_requires = lt_items.
           DELETE lt_requires WHERE obj_type <> 'DDLS'.
diff --git a/src/objects/zcl_abapgit_object_idoc.clas.abap b/src/objects/zcl_abapgit_object_idoc.clas.abap
index e01d7db1a..5b958f5b0 100644
--- a/src/objects/zcl_abapgit_object_idoc.clas.abap
+++ b/src/objects/zcl_abapgit_object_idoc.clas.abap
@@ -163,6 +163,9 @@ CLASS zcl_abapgit_object_idoc IMPLEMENTATION.
     MOVE-CORRESPONDING ls_idoc-attributes TO ls_attributes.
 
     IF zif_abapgit_object~exists( ) = abap_false.
+      " Avoid popup asking for package
+      tadir_insert( iv_package ).
+
       CALL FUNCTION 'IDOCTYPE_CREATE'
         EXPORTING
           pi_idoctyp       = mv_idoctyp
diff --git a/src/objects/zcl_abapgit_object_iext.clas.abap b/src/objects/zcl_abapgit_object_iext.clas.abap
index 712bbf900..c3240dc82 100644
--- a/src/objects/zcl_abapgit_object_iext.clas.abap
+++ b/src/objects/zcl_abapgit_object_iext.clas.abap
@@ -97,6 +97,9 @@ CLASS zcl_abapgit_object_iext IMPLEMENTATION.
         EXCEPTIONS
           OTHERS        = 1.
     ELSE.
+      " Avoid popup asking for package
+      tadir_insert( iv_package ).
+
       CALL FUNCTION 'EXTTYPE_CREATE'
         EXPORTING
           pi_cimtyp     = mv_extension
diff --git a/src/objects/zcl_abapgit_object_ucsa.clas.abap b/src/objects/zcl_abapgit_object_ucsa.clas.abap
index 95b791087..0f80e1516 100644
--- a/src/objects/zcl_abapgit_object_ucsa.clas.abap
+++ b/src/objects/zcl_abapgit_object_ucsa.clas.abap
@@ -158,6 +158,8 @@ CLASS zcl_abapgit_object_ucsa IMPLEMENTATION.
 
     tadir_delete( ).
 
+    corr_insert( iv_package ).
+
   ENDMETHOD.
 
 
@@ -195,6 +197,8 @@ CLASS zcl_abapgit_object_ucsa IMPLEMENTATION.
 
         tadir_insert( iv_package ).
 
+        corr_insert( iv_package ).
+
       CATCH cx_root INTO lx_root.
         lv_text = lx_root->get_text( ).
         zcx_abapgit_exception=>raise( lv_text ).