M1

Serialization changes