SSDP improvements