Updated database structure + data