change parser output to dict #32