Fix difference in the model
Last fixes