Add complete support for environment variables (EnvInject)