Altered models to match new db structure.