Added UPnP support