Added option to skip autoindexing