Added more to the parser to make it parse fields