Added serializable attributes to modelling classes