Added support of EntityIndexingInterceptor