Impovements of the Model class code - 2