Fixed parsing

Parsing now works for the new format