Updated parser and model