added more proxy support