Updated a bit of parsing