Added in UPnP stuff