Added Proxy Support and other changes.