add Optional return type to indexes methods
Merge branch 'add/optional/for/indexes'