Add auto index ability