Added index generation