Add support for proxying