diff --git a/MPSoC/mutekh/arch/soclib/deployinfo.h b/MPSoC/mutekh/arch/soclib/deployinfo.h
index 6e62ce89676c458566facd6a8ff7c0bf76961dd0..8a62d56e3168fecfbde662b31195717fea5c5faf 100644
--- a/MPSoC/mutekh/arch/soclib/deployinfo.h
+++ b/MPSoC/mutekh/arch/soclib/deployinfo.h
@@ -1,7 +1,7 @@
 
 #define CACHED_RAM0_NAME cram0
 #define CACHED_RAM0_ADDR 0x10000000
-#define CACHED_RAM0_SIZE 0x80000
+#define CACHED_RAM0_SIZE 0x1000000
 #define DEPLOY_RAM0_NAME uram0
-#define DEPLOY_RAM0_ADDR 0x10280000
-#define DEPLOY_RAM0_SIZE 0x80000
+#define DEPLOY_RAM0_ADDR 0x11200000
+#define DEPLOY_RAM0_SIZE 0x1000000
diff --git a/MPSoC/mutekh/arch/soclib/deployinfo_map.h b/MPSoC/mutekh/arch/soclib/deployinfo_map.h
index 472a495c3fbb0c449844bde0bc759c0029d4a037..bbd2c0be29f97879ba9115fd9132f8a9a35bd6e4 100644
--- a/MPSoC/mutekh/arch/soclib/deployinfo_map.h
+++ b/MPSoC/mutekh/arch/soclib/deployinfo_map.h
@@ -27,6 +27,38 @@
 
  .channel6 : { \
 *(section_channel6)\
+} > uram0\
+
+ .channel7 : { \
+*(section_channel7)\
+} > uram0\
+
+ .channel8 : { \
+*(section_channel8)\
+} > uram0\
+
+ .channel9 : { \
+*(section_channel9)\
+} > uram0\
+
+ .channel10 : { \
+*(section_channel10)\
+} > uram0\
+
+ .channel11 : { \
+*(section_channel11)\
+} > uram0\
+
+ .channel12 : { \
+*(section_channel12)\
+} > uram0\
+
+ .channel13 : { \
+*(section_channel13)\
+} > uram0\
+
+ .channel14 : { \
+*(section_channel14)\
 } > uram0\
 
  .lock0 : { \
@@ -56,3 +88,35 @@
  .lock6 : { \
 *(section_lock6)\
 } > uram0\
+
+ .lock7 : { \
+*(section_lock7)\
+} > uram0\
+
+ .lock8 : { \
+*(section_lock8)\
+} > uram0\
+
+ .lock9 : { \
+*(section_lock9)\
+} > uram0\
+
+ .lock10 : { \
+*(section_lock10)\
+} > uram0\
+
+ .lock11 : { \
+*(section_lock11)\
+} > uram0\
+
+ .lock12 : { \
+*(section_lock12)\
+} > uram0\
+
+ .lock13 : { \
+*(section_lock13)\
+} > uram0\
+
+ .lock14 : { \
+*(section_lock14)\
+} > uram0\
diff --git a/MPSoC/mutekh/examples/avatar/config b/MPSoC/mutekh/examples/avatar/config
index 30d1a882f569b67df69d9fc42e016244fba059a7..437b3c2ffbc3f771816770c6c6dc8662eab981f6 100644
--- a/MPSoC/mutekh/examples/avatar/config
+++ b/MPSoC/mutekh/examples/avatar/config
@@ -8,26 +8,30 @@
   # Application license
   CONFIG_LICENSE_APP_LGPL
 
-  # Libs
+# Libs
   CONFIG_PTHREAD
   CONFIG_PTHREAD_MAIN
   CONFIG_PTHREAD_TIME
 
+  CONFIG_PTHREAD_ATTRIBUTES
+
   CONFIG_PTHREAD_STACK_SIZE 32768
   CONFIG_LIBC_STREAM_STD
-#  CONFIG_MUTEK_TIMER undefined
+
   CONFIG_LIBAVATAR
   CONFIG_HEXO_INTTYPES_DEPRECATED undefined
   CONFIG_LIBM
   CONFIG_LIBC_STREAM
   CONFIG_VFS
-
+  CONFIG_MWMR
+  CONFIG_MWMR_SOCLIB
   CONFIG_MUTEK_SCHEDULER_STATIC
 
 %include $(SRC_DIR)/examples/common/build_options.conf
 %include $(SRC_DIR)/examples/common/platforms.conf
 
-  # inter-processor interrupts
+# inter-processor interrupts
   CONFIG_HEXO_IPI
-#  CONFIG_ARCH_SMP undefined
-  CONFIG_CPU_MAXCOUNT 5
+
+  CONFIG_ARCH_SMP
+CONFIG_CPU_MAXCOUNT 5
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANA.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANA.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANA.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANA.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANB.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANB.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANB.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANB.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANC.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANC.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANC.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANC.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMAND.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMAND.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMAND.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMAND.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANE.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANE.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANE.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANE.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANF.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANF.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANF.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANF.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANG.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANG.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANG.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANG.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANH.264 b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANH.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/FOREMANH.264
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/FOREMANH.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/README.TXT b/MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/README.TXT
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk/README.TXT
rename to MPSoC/soclib/benchmarks/decoder_h264/caba_platform/disk.old/README.TXT
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANA.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANA.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANA.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANA.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANB.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANB.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANB.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANB.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANC.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANC.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANC.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANC.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMAND.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMAND.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMAND.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMAND.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANE.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANE.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANE.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANE.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANF.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANF.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANF.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANF.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANG.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANG.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANG.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANG.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANH.264 b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANH.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/FOREMANH.264
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/FOREMANH.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/common/disk/README.TXT b/MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/README.TXT
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/common/disk/README.TXT
rename to MPSoC/soclib/benchmarks/decoder_h264/common/disk.old/README.TXT
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANA.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANA.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANA.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANA.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANB.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANB.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANB.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANB.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANC.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANC.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANC.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANC.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMAND.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMAND.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMAND.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMAND.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANE.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANE.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANE.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANE.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANF.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANF.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANF.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANF.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANG.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANG.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANG.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANG.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANH.264 b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANH.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/FOREMANH.264
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/FOREMANH.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/README.TXT b/MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/README.TXT
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk/README.TXT
rename to MPSoC/soclib/benchmarks/decoder_h264/simple_tlmdt_example/disk.old/README.TXT
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANA.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANA.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANA.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANA.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANB.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANB.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANB.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANB.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANC.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANC.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANC.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANC.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMAND.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMAND.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMAND.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMAND.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANE.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANE.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANE.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANE.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANF.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANF.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANF.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANF.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANG.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANG.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANG.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANG.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANH.264 b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANH.264
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/FOREMANH.264
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/FOREMANH.264
diff --git a/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/README.TXT b/MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/README.TXT
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk/README.TXT
rename to MPSoC/soclib/benchmarks/decoder_h264/tlmdt_platform/disk.old/README.TXT
diff --git a/MPSoC/soclib/benchmarks/decoder_h264_mutekh/disk/: b/MPSoC/soclib/benchmarks/decoder_h264_mutekh/disk/column
similarity index 100%
rename from MPSoC/soclib/benchmarks/decoder_h264_mutekh/disk/:
rename to MPSoC/soclib/benchmarks/decoder_h264_mutekh/disk/column
diff --git a/MPSoC/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/platform_desc b/MPSoC/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/platform_desc
index b58a6bc0a8bcaa0547efe39971120e300ec17aa5..ec5b03015589a7b32a1852f9b9c2113be56804b0 100644
--- a/MPSoC/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/platform_desc
+++ b/MPSoC/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/platform_desc
@@ -11,7 +11,7 @@ Uses('caba:vci_ethernet'),
 Uses('caba:vci_rttimer'),
 Uses('caba:vci_fd_access'),
 Uses('caba:vci_simhelper'),
-Uses('caba:vci_vgsb'),
+Uses('caba:vci_vgmn'),
 Uses('caba:vci_mwmr_stats'),
 Uses('caba:vci_logger'),
 Uses('caba:vci_local_crossbar'),
diff --git a/proverif/README b/proverif/README
new file mode 100644
index 0000000000000000000000000000000000000000..8be69da8b986ec97be133d17d85fa87e392cd618
--- /dev/null
+++ b/proverif/README
@@ -0,0 +1 @@
+This directory contains proverif specifications generated by TTool.
\ No newline at end of file