@marcel Moving to classes as your data models feels like a “no-go" for me w.r.t Swift Data. The amount of issues that can happen related to access to the objects seems not worth the API they introduced.