More serialization added