improve mm-ns-generators