~WIP: Further improvements to new connection API