Reworked UPnP Discovery Interface