Changed the returned method of parser to a dictionary