Added support for strict context regarind.