Adjustments for entities convertions