begin refactoring to use IndexFields constants