Added z configuration & updated submodules