connection resolver refactor