Updated Database and Models