Add EntityIdPager and TermLookup