Added FormatArrayIndex and FormatKeyValue