Converted to proxy style connections