Added --full-index option