Got pass-through annotation working with new format.