Another connection refactor.