Updated serialization for None values