Change Model to have its non-attr properties have an explicit .cls or .do