Add support for environments