Update for Server UserDataManager changes