Updated database structure for synchronisation