Add support for environment variables