Further change for uid support