Corrected Database and Models