Use proper serialization