Refactored parser-spec