Updated models to match database.