Sri | More dinodex refactoring, hopefully the last