Added connection related classes