Index enhancements