DF-5184 refactoring of NMaterial