Adding support for check mode