Changes to include proxy settings