diff --git a/Bender.lock b/Bender.lock
index 227c6897..8d93abb8 100644
--- a/Bender.lock
+++ b/Bender.lock
@@ -7,8 +7,8 @@ packages:
     dependencies:
     - common_cells
   axi:
-    revision: bfee21757bf090ec8e358456314b0b0fd3c90809
-    version: 0.39.0
+    revision: fccffb5953ec8564218ba05e20adbedec845e014
+    version: 0.39.1
     source:
       Git: https://github.com/pulp-platform/axi.git
     dependencies:
@@ -16,8 +16,8 @@ packages:
     - common_verification
     - tech_cells_generic
   common_cells:
-    revision: 53b0b58af2db5bd3c850a7038fae170ed78326bb
-    version: 1.31.1
+    revision: 2bd027cb87eaa9bf7d17196ec5f69864b35b630f
+    version: 1.32.0
     source:
       Git: https://github.com/pulp-platform/common_cells.git
     dependencies:
@@ -30,8 +30,8 @@ packages:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
   idma:
-    revision: b31e8f019c657eff4126bc789f0336d403da6766
-    version: 0.4.2
+    revision: ca1b28816a3706be0bf9ce01378246d5346384f0
+    version: 0.5.1
     source:
       Git: https://github.com/pulp-platform/iDMA.git
     dependencies:
@@ -49,8 +49,8 @@ packages:
     - axi
     - common_cells
   tech_cells_generic:
-    revision: a9cae21902e75b1434328ecf36f85327ba5717de
-    version: 0.2.11
+    revision: 7968dd6e6180df2c644636bc6d2908a49f2190cf
+    version: 0.2.13
     source:
       Git: https://github.com/pulp-platform/tech_cells_generic.git
     dependencies:
diff --git a/Bender.yml b/Bender.yml
index a390de7f..cfb64763 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -9,10 +9,10 @@ package:
     - "Tim Fischer <fischeti@iis.ee.ethz.ch>"
 
 dependencies:
-  common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.29.0 }
+  common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.32.0 }
   common_verification: { git: "https://github.com/pulp-platform/common_verification.git", version: 0.2 }
-  axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.0 }
-  idma: { git: "https://github.com/pulp-platform/iDMA.git", version: 0.4.2 }
+  axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.1 }
+  idma: { git: "https://github.com/pulp-platform/iDMA.git", version: 0.5.1 }
 
 export_include_dirs:
   - include
diff --git a/floo_noc.core b/floo_noc.core
index c94b0761..ca4feb51 100644
--- a/floo_noc.core
+++ b/floo_noc.core
@@ -4,20 +4,6 @@ CAPI=2:
 
 name: '::floo_noc:'
 filesets:
-  spyglass_or_synthesis:
-    file_type: systemVerilogSource
-    files:
-    - src/synth/floo_synth_axi_chimney.sv
-    - src/synth/floo_synth_narrow_wide_chimney.sv
-    - src/synth/floo_synth_router.sv
-    - src/synth/floo_synth_router_simple.sv
-    - src/synth/floo_synth_narrow_wide_router.sv
-    - src/synth/floo_synth_endpoint.sv
-    depend:
-    - pulp-platform.org::common_verification:0.2.3
-    - pulp-platform.org::axi:0.38.0
-    - ::idma:0.4.2
-    - pulp-platform.org::common_cells:1.29.0
   test:
     file_type: systemVerilogSource
     files:
@@ -38,17 +24,30 @@ filesets:
     - test/tb_floo_dma_nw_chimney.sv
     - test/tb_floo_dma_mesh.sv
     depend:
+    - pulp-platform.org::common_cells:1.32.0
+    - pulp-platform.org::common_verification:0.2.3
+    - pulp-platform.org::axi:0.39.1
+    - ::idma:0.5.1
+  spyglass_or_synthesis:
+    file_type: systemVerilogSource
+    files:
+    - test/floo_test_pkg.sv
+    - src/synth/floo_synth_axi_chimney.sv
+    - src/synth/floo_synth_narrow_wide_chimney.sv
+    - src/synth/floo_synth_router.sv
+    - src/synth/floo_synth_narrow_wide_router.sv
+    - src/synth/floo_synth_endpoint.sv
+    depend:
+    - pulp-platform.org::common_cells:1.32.0
     - pulp-platform.org::common_verification:0.2.3
-    - pulp-platform.org::axi:0.38.0
-    - ::idma:0.4.2
-    - pulp-platform.org::common_cells:1.29.0
+    - pulp-platform.org::axi:0.39.1
+    - ::idma:0.5.1
   files_rtl:
     file_type: systemVerilogSource
     files:
-    - src/floo_axi_flit_pkg.sv
-    - src/floo_narrow_wide_flit_pkg.sv
+    - src/floo_axi_pkg.sv
+    - src/floo_narrow_wide_pkg.sv
     - src/floo_pkg.sv
-    - src/floo_param_pkg.sv
     - src/floo_cut.sv
     - src/floo_fifo.sv
     - src/floo_cdc.sv
@@ -57,6 +56,7 @@ filesets:
     - src/floo_wormhole_arbiter.sv
     - src/floo_simple_rob.sv
     - src/floo_rob.sv
+    - src/floo_rob_wrapper.sv
     - src/floo_meta_buffer.sv
     - src/floo_axi_chimney.sv
     - src/floo_narrow_wide_chimney.sv
@@ -66,10 +66,10 @@ filesets:
         is_include_file: true
         include_path: include
     depend:
+    - pulp-platform.org::common_cells:1.32.0
     - pulp-platform.org::common_verification:0.2.3
-    - pulp-platform.org::axi:0.38.0
-    - ::idma:0.4.2
-    - pulp-platform.org::common_cells:1.29.0
+    - pulp-platform.org::axi:0.39.1
+    - ::idma:0.5.1
 targets:
   default:
     filesets: