Added entities to map format