Support for environments is back