Simplify Material hierarchy