First bits of extraIndex support.