Using env_config instead of env_source, adapting to last master changes