Refactored EntityInfo-Entity collaboration.