Added index handling