Added proxy config options

rebased