Updated the connection system