Make entity message diff-based