Implemented proxy support