Updated to external proxy handler