Add back proxy support