Added types to the model attributes