Minor additions to the model class