Added id to entity data formatter