Update for better Proxy handling and upcoming features like IPV6