Updted database and model