Added User fields to implement updated IUser