added ability to map uncontrolled environment variables