Improved indexes in data gen