Improving of the Model class code