Restructured lots of the parsing, separating the fields into a field collection