Why not do the same that is done for uid_data?