[DF-29] Final material refactoring