Start reworking generator to use the repoindex