NEW: proxy support