Added index_mode flag