Index definitions are now a map not a string array