Added support for staging environment