Adding type to the retrieved data identifier and locations of entities.