Parser now accepts more cases