Updated parsing and views