Updated models to match database tables.