Changes to the modle for the new database structure [#66954860].