added proxy feature