Added index manager