Improve Connection class