model rebuild, name_space added