updated db and models