Add create index for speed back