Updated parsing spec to match model spec