Further work on the spec parser