introducing proxy support