Refactored, added Proxy and PROXY_FORMAT.