Improve entity creation performance