Updated more modules
Re-added properly our mz features