devicediscovery: add more sophisticated discovery