Added index tracking