Add better support for safe updates with multiple writers