Adding support for strict mode