I was sure I had already commite that modification to generation target
!
added generated model beans
Improved mapping by using better classes definitions