modifed models to match database