Updated parsing method