Improve parsing of material/form