Add proxy support. Some linting