Updated database structure