Added support for native indexes and finding from indexes