Trying to bring back intended indexes. Looks like there is one more refactor left