Updates to parse converter