ADD Unique IDs along with names for the entities