Added Proxy support and fixed requeuing