Fixing doc with multiple discovery related features.