Add strict/lenient mode