Add better tracking to parsing stage of problem