Minor change in User and connection class