add uid support in entities