Updated parsing and rendering