Changes due to the model refactoring
End of the refactoring of the model.