Expose EntityIndices and haddock clean up