Added Comment and User classes