Use new (de)serialization interfaces and some tweaks (for 1.0)