Add scan-index option