Updated model classes

Late commit of old updates to model classes.