Rebuilt DeviceFinder