Use our own version of the data model
Added the versioning exception and more versioning support