Feature/deep index redo