Updated database and model