Revamped classes in User.cs