Added proxy settings
Added CLI proxy support