Updating models to use traits