Moving indexes out of the raven bootstrap