Added auto-gen index