Updated results parser (needs test)