Added support for environment variables