Add support for indexes not named index