Adding discoverability