Add reindex before generation