Update

Better serialization