Updated models to reflect new db schema