+ Added handling of structs as model properties