More XML serializer work