Updated database methods