Hey @baml-sam PR for #793 is up: https://github.com/BoundaryML/baml/pull/3819 Like you said, I didn't reorder the classes. Instead the generator now adds model_rebuild() for every class at the end of types.py/stream_types.py, so forward refs work no matter the order. (Pydantic v1 uses update_forward_refs().) Tested on py3.9 + pydantic 2.1.0 up to the latest, plus v1 — all good, tests green. Let me know if you want any changes