Added more fields to our model