Add support for multiple env states