Update to newer better class materials