PIM-3471 : re-work the index creator