Warning to not use notes field
Added material handler