Further porting on way to use `Connection()`