- Add Text Search support
- Include Indexer