Updated database parser