improve proxy support