@Christian We tried implementing Composite Primary Key, but we were facing some challenges there as well since we are using HBM XML Mapping Files, and have really complex data model. Also, this route would again require a lot of code changes, even findById method would now required a primary key class.

One of the problem was this: https://discourse.hibernate.org/t/how-to-have-the-same-column-as-part-of-composite-id-and-many-to-one-relationship/7285