I would prefer all of these new attributes were added to multiple new models, but this works for now. We can refactor it later.