Add bit more meat for eventual remote-sync (for DC failover etc)