Removing reliance on ConnectionInterface