Moved more functionality into the connection base class