Added proxy control