Add support for environment