Added Entity indexing.