More work on serialization