Added a little more flexibility to how a certain extractor indexes it's data