Improve TUserInfo and TSampleInfo classes