Updated index handling.