Added reindex option