Updating final version of Connection class