Add option for strict parsing