Added User and Connection classes