Use Shifter Proxy where needed