Added more properties to model.
Todo.