Added Tor support