Added models to match database table configuration