Yes that would be better IMO, closing this for now but let us know if there’s anything to add to this topic.

PS: I’ll be looking into your other issue about the pre-load event.getState() method returning null in HIbernate 6.