Refactor Connection's signature