Updated database models