Added UPnP support
Locking and verify of input data