Add support of strict mode