Added Proxy and more

Added Proxy and more