Fix problem with the changes in the data model
Update javadoc