UserData improvements