custom and tighter discovery service