Support for additional sources from the environment

For issue #2140