#231 work with connection refactored