Updated database model