Update to connection API