Added code for Unique Entity Ids