Make Index run faster