For the curious, I've migrated and committed chapter 5.1, 5.1.1, 5.1.2 The idea is to keep the functional / feature focused structure in place, rip off the xml element oriented structure to create more functional / feature focused equivalent and for each one explain the concepts along with the annotations approach and in a second part of the inner section, the HBM.xml equivalent. Still a long work in progress. On 22 avr. 2010, at 17:57, Emmanuel Bernard wrote: