Added support for staging environments