Improve User.cs