Added basic proxy support