Updated parsing