Replaces to new parser spec