Add experimental support for proxying