First round of updates to Material class.