Enhancement to the device discovery service