Added additional Material support