More work on friendly serialization