Updated basic User model