Proxy handling added