Sync with serialization