added support for sandbox environment