[Connection] refacto