implementing proper entity id creation
implementing proper entity id creation cont