Updated database structure and data