Fixed models to match new db schema