Model class fixes