Added support for environment tiers