Added upstream proxy wrapper