Added new mapping with entity and its data in circles