Updated database service