- Improved addIndex