Added the model structure and properties