More index templating conversion WIP