fixup! fixup! migrate old index mapping to new array type mapping