Working on device discovery per target