Hello, I see in the code that "classical" ORM mapping and "dynamic" EntityMap XML mapping are both used... sometimes for backward compatibility, sometimes as a feature... but this is not easy to understand the exact status... Tell me if I'm wrong or right: - Class/PropertyClass classical Table mapping is no more the preferred choice - a Class is now directly linked to a Doc and it is created and stored within the Doc... - Class/PropertyClass mapping is now stored by default using XML custommapping in Doc (Class tables are still available with the right option) - Object/Property are stored by default in tables using classical ORM but also using EntityMap when the Class has a custommapping So, what is the current and future tendency for all of this? classes in XML and object in tables? something different? I don't know the history of the project but I find the code of XWikiDoc is quite dependent on the chosen mapping of classes, objects etc... Do you intend to introduce an abstraction about the mapping? Finally, a bulk remark: going further, could a XWikiDoc be considered as a class itself? Best regards Pascal