Fixing datamodel.