Updated database approach