Add ConnectionWrapper