Adding index generator - wip