refactoring: use new - insteed of old index fields
refactoring: use new - insteed of old index fields