Added index feature