Update for material hierarchy changes