Updated the connection code to get rid of the annoying i18n deprecation warnings