minor modifications to Model class