Good catch.  The appropriate fix will be to define a V2 data structure.