Use new discovery mechanism