Luis Barreiro I think the problem is likely the fact that targetEntity is used. This is used to define the entity that the many-to-one points to. My guess is that the Enhancer is not taking that into account.

And in fact that gets into a longer term design discussion. At the moment the Enhancer works directly from the Class model. Which means it misses out on all of the work done in our binders. Longer term I think it would be better to drive the Enhancer from the bound Metamodel.