adding support for environment variables