Initial support for indexers
Merge branch 'feature/basic-indexers'