Add possbility of specifying a proxy