More tunning on EnviromentDiscovery