Partial serialization changes