Adding support for environment variables, env_var