Improvements of the Model code - 3