Add auto index creation support