diff --git a/src/xml/conference-info.cpp b/src/xml/conference-info.cpp
index 6defae04f..59f648483 100644
--- a/src/xml/conference-info.cpp
+++ b/src/xml/conference-info.cpp
@@ -61,7 +61,7 @@ namespace LinphonePrivate
     namespace ConferenceInfo
     {
       // ConferenceType
-      //
+      // 
 
       const ConferenceType::ConferenceDescriptionOptional& ConferenceType::
       getConferenceDescription () const
@@ -383,7 +383,7 @@ namespace LinphonePrivate
 
 
       // StateType
-      //
+      // 
 
       StateType::
       StateType (Value v)
@@ -420,7 +420,7 @@ namespace LinphonePrivate
       StateType& StateType::
       operator= (Value v)
       {
-        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
+        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) = 
         ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_StateType_literals_[v]);
 
         return *this;
@@ -428,7 +428,7 @@ namespace LinphonePrivate
 
 
       // ConferenceDescriptionType
-      //
+      // 
 
       const ConferenceDescriptionType::DisplayTextOptional& ConferenceDescriptionType::
       getDisplayText () const
@@ -714,7 +714,7 @@ namespace LinphonePrivate
 
 
       // HostType
-      //
+      // 
 
       const HostType::DisplayTextOptional& HostType::
       getDisplayText () const
@@ -856,7 +856,7 @@ namespace LinphonePrivate
 
 
       // ConferenceStateType
-      //
+      // 
 
       const ConferenceStateType::UserCountOptional& ConferenceStateType::
       getUserCount () const
@@ -980,7 +980,7 @@ namespace LinphonePrivate
 
 
       // ConferenceMediaType
-      //
+      // 
 
       const ConferenceMediaType::EntrySequence& ConferenceMediaType::
       getEntry () const
@@ -1032,7 +1032,7 @@ namespace LinphonePrivate
 
 
       // ConferenceMediumType
-      //
+      // 
 
       const ConferenceMediumType::DisplayTextOptional& ConferenceMediumType::
       getDisplayText () const
@@ -1204,7 +1204,7 @@ namespace LinphonePrivate
 
 
       // UrisType
-      //
+      // 
 
       const UrisType::EntrySequence& UrisType::
       getEntry () const
@@ -1292,7 +1292,7 @@ namespace LinphonePrivate
 
 
       // UriType
-      //
+      // 
 
       const UriType::UriType1& UriType::
       getUri () const
@@ -1488,7 +1488,7 @@ namespace LinphonePrivate
       }
 
       // UsersType
-      //
+      // 
 
       const UsersType::UserSequence& UsersType::
       getUser () const
@@ -1594,7 +1594,7 @@ namespace LinphonePrivate
 
 
       // UserType
-      //
+      // 
 
       const UserType::DisplayTextOptional& UserType::
       getDisplayText () const
@@ -1880,7 +1880,7 @@ namespace LinphonePrivate
 
 
       // UserRolesType
-      //
+      // 
 
       const UserRolesType::EntrySequence& UserRolesType::
       getEntry () const
@@ -1956,7 +1956,7 @@ namespace LinphonePrivate
       }
 
       // EndpointType
-      //
+      // 
 
       const EndpointType::DisplayTextOptional& EndpointType::
       getDisplayText () const
@@ -2332,7 +2332,7 @@ namespace LinphonePrivate
 
 
       // EndpointStatusType
-      //
+      // 
 
       EndpointStatusType::
       EndpointStatusType (Value v)
@@ -2369,7 +2369,7 @@ namespace LinphonePrivate
       EndpointStatusType& EndpointStatusType::
       operator= (Value v)
       {
-        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
+        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) = 
         ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_EndpointStatusType_literals_[v]);
 
         return *this;
@@ -2377,7 +2377,7 @@ namespace LinphonePrivate
 
 
       // JoiningType
-      //
+      // 
 
       JoiningType::
       JoiningType (Value v)
@@ -2414,7 +2414,7 @@ namespace LinphonePrivate
       JoiningType& JoiningType::
       operator= (Value v)
       {
-        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
+        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) = 
         ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_JoiningType_literals_[v]);
 
         return *this;
@@ -2422,7 +2422,7 @@ namespace LinphonePrivate
 
 
       // DisconnectionType
-      //
+      // 
 
       DisconnectionType::
       DisconnectionType (Value v)
@@ -2459,7 +2459,7 @@ namespace LinphonePrivate
       DisconnectionType& DisconnectionType::
       operator= (Value v)
       {
-        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
+        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) = 
         ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_DisconnectionType_literals_[v]);
 
         return *this;
@@ -2467,7 +2467,7 @@ namespace LinphonePrivate
 
 
       // ExecutionType
-      //
+      // 
 
       const ExecutionType::WhenOptional& ExecutionType::
       getWhen () const
@@ -2591,7 +2591,7 @@ namespace LinphonePrivate
 
 
       // CallType
-      //
+      // 
 
       const CallType::SipOptional& CallType::
       getSip () const
@@ -2673,7 +2673,7 @@ namespace LinphonePrivate
 
 
       // SipDialogIdType
-      //
+      // 
 
       const SipDialogIdType::DisplayTextOptional& SipDialogIdType::
       getDisplayText () const
@@ -2845,7 +2845,7 @@ namespace LinphonePrivate
 
 
       // MediaType
-      //
+      // 
 
       const MediaType::DisplayTextOptional& MediaType::
       getDisplayText () const
@@ -3077,7 +3077,7 @@ namespace LinphonePrivate
 
 
       // MediaStatusType
-      //
+      // 
 
       MediaStatusType::
       MediaStatusType (Value v)
@@ -3114,7 +3114,7 @@ namespace LinphonePrivate
       MediaStatusType& MediaStatusType::
       operator= (Value v)
       {
-        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
+        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) = 
         ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_MediaStatusType_literals_[v]);
 
         return *this;
@@ -3122,7 +3122,7 @@ namespace LinphonePrivate
 
 
       // SidebarsByValType
-      //
+      // 
 
       const SidebarsByValType::EntrySequence& SidebarsByValType::
       getEntry () const
diff --git a/src/xml/conference-info.h b/src/xml/conference-info.h
index d4efda4f6..e9c315fd5 100644
--- a/src/xml/conference-info.h
+++ b/src/xml/conference-info.h
@@ -582,7 +582,7 @@ namespace LinphonePrivate
         ConferenceType&
         operator= (const ConferenceType& x);
 
-        virtual
+        virtual 
         ~ConferenceType ();
 
         // Implementation.
@@ -891,7 +891,7 @@ namespace LinphonePrivate
         ConferenceDescriptionType&
         operator= (const ConferenceDescriptionType& x);
 
-        virtual
+        virtual 
         ~ConferenceDescriptionType ();
 
         // Implementation.
@@ -1039,7 +1039,7 @@ namespace LinphonePrivate
         HostType&
         operator= (const HostType& x);
 
-        virtual
+        virtual 
         ~HostType ();
 
         // Implementation.
@@ -1173,7 +1173,7 @@ namespace LinphonePrivate
         ConferenceStateType&
         operator= (const ConferenceStateType& x);
 
-        virtual
+        virtual 
         ~ConferenceStateType ();
 
         // Implementation.
@@ -1255,7 +1255,7 @@ namespace LinphonePrivate
         ConferenceMediaType&
         operator= (const ConferenceMediaType& x);
 
-        virtual
+        virtual 
         ~ConferenceMediaType ();
 
         // Implementation.
@@ -1415,7 +1415,7 @@ namespace LinphonePrivate
         ConferenceMediumType&
         operator= (const ConferenceMediumType& x);
 
-        virtual
+        virtual 
         ~ConferenceMediumType ();
 
         // Implementation.
@@ -1521,7 +1521,7 @@ namespace LinphonePrivate
         UrisType&
         operator= (const UrisType& x);
 
-        virtual
+        virtual 
         ~UrisType ();
 
         // Implementation.
@@ -1683,7 +1683,7 @@ namespace LinphonePrivate
         UriType&
         operator= (const UriType& x);
 
-        virtual
+        virtual 
         ~UriType ();
 
         // Implementation.
@@ -1739,7 +1739,7 @@ namespace LinphonePrivate
         _clone (::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
                 ::LinphonePrivate::Xsd::XmlSchema::Container* c = 0) const;
 
-        virtual
+        virtual 
         ~KeywordsType ();
       };
 
@@ -1843,7 +1843,7 @@ namespace LinphonePrivate
         UsersType&
         operator= (const UsersType& x);
 
-        virtual
+        virtual 
         ~UsersType ();
 
         // Implementation.
@@ -2089,7 +2089,7 @@ namespace LinphonePrivate
         UserType&
         operator= (const UserType& x);
 
-        virtual
+        virtual 
         ~UserType ();
 
         // Implementation.
@@ -2177,7 +2177,7 @@ namespace LinphonePrivate
         UserRolesType&
         operator= (const UserRolesType& x);
 
-        virtual
+        virtual 
         ~UserRolesType ();
 
         // Implementation.
@@ -2229,7 +2229,7 @@ namespace LinphonePrivate
         _clone (::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
                 ::LinphonePrivate::Xsd::XmlSchema::Container* c = 0) const;
 
-        virtual
+        virtual 
         ~UserLanguagesType ();
       };
 
@@ -2522,7 +2522,7 @@ namespace LinphonePrivate
         EndpointType&
         operator= (const EndpointType& x);
 
-        virtual
+        virtual 
         ~EndpointType ();
 
         // Implementation.
@@ -2837,7 +2837,7 @@ namespace LinphonePrivate
         ExecutionType&
         operator= (const ExecutionType& x);
 
-        virtual
+        virtual 
         ~ExecutionType ();
 
         // Implementation.
@@ -2937,7 +2937,7 @@ namespace LinphonePrivate
         CallType&
         operator= (const CallType& x);
 
-        virtual
+        virtual 
         ~CallType ();
 
         // Implementation.
@@ -3098,7 +3098,7 @@ namespace LinphonePrivate
         SipDialogIdType&
         operator= (const SipDialogIdType& x);
 
-        virtual
+        virtual 
         ~SipDialogIdType ();
 
         // Implementation.
@@ -3304,7 +3304,7 @@ namespace LinphonePrivate
         MediaType&
         operator= (const MediaType& x);
 
-        virtual
+        virtual 
         ~MediaType ();
 
         // Implementation.
@@ -3470,7 +3470,7 @@ namespace LinphonePrivate
         SidebarsByValType&
         operator= (const SidebarsByValType& x);
 
-        virtual
+        virtual 
         ~SidebarsByValType ();
 
         // Implementation.
@@ -3717,14 +3717,14 @@ namespace LinphonePrivate
 
       void
       serializeConferenceInfo (::std::ostream& os,
-                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x,
+                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x, 
                                const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                                const ::std::string& e = "UTF-8",
                                ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
       void
       serializeConferenceInfo (::std::ostream& os,
-                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x,
+                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x, 
                                ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
                                const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                                const ::std::string& e = "UTF-8",
@@ -3732,7 +3732,7 @@ namespace LinphonePrivate
 
       void
       serializeConferenceInfo (::std::ostream& os,
-                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x,
+                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x, 
                                ::xercesc::DOMErrorHandler& eh,
                                const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                                const ::std::string& e = "UTF-8",
@@ -3743,14 +3743,14 @@ namespace LinphonePrivate
 
       void
       serializeConferenceInfo (::xercesc::XMLFormatTarget& ft,
-                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x,
+                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x, 
                                const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                                const ::std::string& e = "UTF-8",
                                ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
       void
       serializeConferenceInfo (::xercesc::XMLFormatTarget& ft,
-                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x,
+                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x, 
                                ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
                                const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                                const ::std::string& e = "UTF-8",
@@ -3758,7 +3758,7 @@ namespace LinphonePrivate
 
       void
       serializeConferenceInfo (::xercesc::XMLFormatTarget& ft,
-                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x,
+                               const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x, 
                                ::xercesc::DOMErrorHandler& eh,
                                const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                                const ::std::string& e = "UTF-8",
@@ -3776,7 +3776,7 @@ namespace LinphonePrivate
       //
 
       ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeConferenceInfo (const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x,
+      serializeConferenceInfo (const ::LinphonePrivate::Xsd::ConferenceInfo::ConferenceType& x, 
                                const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                                ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
diff --git a/src/xml/resource-lists.cpp b/src/xml/resource-lists.cpp
index 908b3a63c..d74589fde 100644
--- a/src/xml/resource-lists.cpp
+++ b/src/xml/resource-lists.cpp
@@ -61,7 +61,7 @@ namespace LinphonePrivate
     namespace ResourceLists
     {
       // ListType
-      //
+      // 
 
       const ListType::DisplayNameOptional& ListType::
       getDisplayName () const
@@ -245,7 +245,7 @@ namespace LinphonePrivate
 
 
       // EntryType
-      //
+      // 
 
       const EntryType::DisplayNameOptional& EntryType::
       getDisplayName () const
@@ -357,7 +357,7 @@ namespace LinphonePrivate
 
 
       // EntryRefType
-      //
+      // 
 
       const EntryRefType::DisplayNameOptional& EntryRefType::
       getDisplayName () const
@@ -469,7 +469,7 @@ namespace LinphonePrivate
 
 
       // ExternalType
-      //
+      // 
 
       const ExternalType::DisplayNameOptional& ExternalType::
       getDisplayName () const
@@ -581,7 +581,7 @@ namespace LinphonePrivate
 
 
       // DisplayNameType
-      //
+      // 
 
       const DisplayNameType::LangOptional& DisplayNameType::
       getLang () const
@@ -615,15 +615,15 @@ namespace LinphonePrivate
 
 
       // List
-      //
+      // 
 
 
       // DisplayName
-      //
+      // 
 
 
       // ResourceLists
-      //
+      // 
 
       const ResourceLists::ListSequence& ResourceLists::
       getList () const
diff --git a/src/xml/resource-lists.h b/src/xml/resource-lists.h
index df92df043..b2384df98 100644
--- a/src/xml/resource-lists.h
+++ b/src/xml/resource-lists.h
@@ -49,14 +49,14 @@
 // Begin prologue.
 //
 #if __clang__ || __GNUC__ >= 4
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wfloat-equal"
-  #pragma GCC diagnostic ignored "-Wsign-conversion"
-  #pragma GCC diagnostic ignored "-Wconversion"
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wfloat-equal"
+	#pragma GCC diagnostic ignored "-Wsign-conversion"
+	#pragma GCC diagnostic ignored "-Wconversion"
 #endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wsuggest-override"
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
 #if __GNUC__ >=7
 	#pragma GCC diagnostic push
@@ -489,7 +489,7 @@ namespace LinphonePrivate
         ListType&
         operator= (const ListType& x);
 
-        virtual
+        virtual 
         ~ListType ();
 
         // Implementation.
@@ -613,7 +613,7 @@ namespace LinphonePrivate
         EntryType&
         operator= (const EntryType& x);
 
-        virtual
+        virtual 
         ~EntryType ();
 
         // Implementation.
@@ -733,7 +733,7 @@ namespace LinphonePrivate
         EntryRefType&
         operator= (const EntryRefType& x);
 
-        virtual
+        virtual 
         ~EntryRefType ();
 
         // Implementation.
@@ -854,7 +854,7 @@ namespace LinphonePrivate
         ExternalType&
         operator= (const ExternalType& x);
 
-        virtual
+        virtual 
         ~ExternalType ();
 
         // Implementation.
@@ -922,7 +922,7 @@ namespace LinphonePrivate
         DisplayNameType&
         operator= (const DisplayNameType& x);
 
-        virtual
+        virtual 
         ~DisplayNameType ();
 
         // Implementation.
@@ -955,7 +955,7 @@ namespace LinphonePrivate
         _clone (::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
                 ::LinphonePrivate::Xsd::XmlSchema::Container* c = 0) const;
 
-        virtual
+        virtual 
         ~List ();
       };
 
@@ -984,7 +984,7 @@ namespace LinphonePrivate
         _clone (::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
                 ::LinphonePrivate::Xsd::XmlSchema::Container* c = 0) const;
 
-        virtual
+        virtual 
         ~DisplayName ();
       };
 
@@ -1027,7 +1027,7 @@ namespace LinphonePrivate
         ResourceLists&
         operator= (const ResourceLists& x);
 
-        virtual
+        virtual 
         ~ResourceLists ();
 
         // Implementation.
@@ -1218,14 +1218,14 @@ namespace LinphonePrivate
 
       void
       serializeResourceLists (::std::ostream& os,
-                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x,
+                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x, 
                               const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                               const ::std::string& e = "UTF-8",
                               ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
       void
       serializeResourceLists (::std::ostream& os,
-                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x,
+                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x, 
                               ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
                               const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                               const ::std::string& e = "UTF-8",
@@ -1233,7 +1233,7 @@ namespace LinphonePrivate
 
       void
       serializeResourceLists (::std::ostream& os,
-                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x,
+                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x, 
                               ::xercesc::DOMErrorHandler& eh,
                               const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                               const ::std::string& e = "UTF-8",
@@ -1244,14 +1244,14 @@ namespace LinphonePrivate
 
       void
       serializeResourceLists (::xercesc::XMLFormatTarget& ft,
-                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x,
+                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x, 
                               const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                               const ::std::string& e = "UTF-8",
                               ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
       void
       serializeResourceLists (::xercesc::XMLFormatTarget& ft,
-                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x,
+                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x, 
                               ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
                               const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                               const ::std::string& e = "UTF-8",
@@ -1259,7 +1259,7 @@ namespace LinphonePrivate
 
       void
       serializeResourceLists (::xercesc::XMLFormatTarget& ft,
-                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x,
+                              const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x, 
                               ::xercesc::DOMErrorHandler& eh,
                               const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                               const ::std::string& e = "UTF-8",
@@ -1277,7 +1277,7 @@ namespace LinphonePrivate
       //
 
       ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeResourceLists (const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x,
+      serializeResourceLists (const ::LinphonePrivate::Xsd::ResourceLists::ResourceLists& x, 
                               const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                               ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
diff --git a/src/xml/rlmi.cpp b/src/xml/rlmi.cpp
index a1fd81f68..eb0541331 100644
--- a/src/xml/rlmi.cpp
+++ b/src/xml/rlmi.cpp
@@ -34,14 +34,18 @@
 // Begin prologue.
 //
 #if __clang__ || __GNUC__ >= 4
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wfloat-equal"
-  #pragma GCC diagnostic ignored "-Wsign-conversion"
-  #pragma GCC diagnostic ignored "-Wconversion"
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wfloat-equal"
+	#pragma GCC diagnostic ignored "-Wsign-conversion"
+	#pragma GCC diagnostic ignored "-Wconversion"
 #endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wsuggest-override"
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #endif
 //
 // End prologue.
@@ -57,7 +61,7 @@ namespace LinphonePrivate
     namespace Rlmi
     {
       // List
-      //
+      // 
 
       const List::NameSequence& List::
       getName () const
@@ -223,7 +227,7 @@ namespace LinphonePrivate
 
 
       // Resource
-      //
+      // 
 
       const Resource::NameSequence& Resource::
       getName () const
@@ -323,7 +327,7 @@ namespace LinphonePrivate
 
 
       // Instance
-      //
+      // 
 
       const Instance::AnySequence& Instance::
       getAny () const
@@ -495,7 +499,7 @@ namespace LinphonePrivate
 
 
       // Name
-      //
+      // 
 
       const Name::LangOptional& Name::
       getLang () const
@@ -529,7 +533,7 @@ namespace LinphonePrivate
 
 
       // State
-      //
+      // 
 
       State::
       State (Value v)
@@ -566,7 +570,7 @@ namespace LinphonePrivate
       State& State::
       operator= (Value v)
       {
-        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
+        static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) = 
         ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_State_literals_[v]);
 
         return *this;
@@ -579,6 +583,15 @@ namespace LinphonePrivate
 
 #include <xsd/cxx/xml/dom/parsing-source.hxx>
 
+#include <xsd/cxx/tree/type-factory-map.hxx>
+
+namespace _xsd
+{
+  static
+  const ::xsd::cxx::tree::type_factory_plate< 0, char >
+  type_factory_plate_init;
+}
+
 namespace LinphonePrivate
 {
   namespace Xsd
@@ -1251,6 +1264,15 @@ namespace LinphonePrivate
 
 #include <ostream>
 
+#include <xsd/cxx/tree/std-ostream-map.hxx>
+
+namespace _xsd
+{
+  static
+  const ::xsd::cxx::tree::std_ostream_plate< 0, char >
+  std_ostream_plate_init;
+}
+
 namespace LinphonePrivate
 {
   namespace Xsd
@@ -1627,804 +1649,6 @@ namespace LinphonePrivate
           "list",
           "urn:ietf:params:xml:ns:rlmi");
       }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::std::string& u,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        h.throw_if_failed< ::xsd::cxx::tree::parsing< char > > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > (
-          ::LinphonePrivate::Xsd::Rlmi::parseResource (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::std::string& u,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > (
-          ::LinphonePrivate::Xsd::Rlmi::parseResource (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::std::string& u,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > (
-          ::LinphonePrivate::Xsd::Rlmi::parseResource (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseResource (isrc, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseResource (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseResource (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     const ::std::string& sid,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseResource (isrc, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     const ::std::string& sid,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseResource (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     const ::std::string& sid,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseResource (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::xercesc::InputSource& i,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        h.throw_if_failed< ::xsd::cxx::tree::parsing< char > > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > (
-          ::LinphonePrivate::Xsd::Rlmi::parseResource (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::xercesc::InputSource& i,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > (
-          ::LinphonePrivate::Xsd::Rlmi::parseResource (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::xercesc::InputSource& i,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > (
-          ::LinphonePrivate::Xsd::Rlmi::parseResource (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::xercesc::DOMDocument& doc,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        if (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom)
-        {
-          ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-            static_cast< ::xercesc::DOMDocument* > (doc.cloneNode (true)));
-
-          return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > (
-            ::LinphonePrivate::Xsd::Rlmi::parseResource (
-              std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-        }
-
-        const ::xercesc::DOMElement& e (*doc.getDocumentElement ());
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (n.name () == "resource" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > r (
-            ::xsd::cxx::tree::traits< ::LinphonePrivate::Xsd::Rlmi::Resource, char >::create (
-              e, f, 0));
-          return r;
-        }
-
-        throw ::xsd::cxx::tree::unexpected_element < char > (
-          n.name (),
-          n.namespace_ (),
-          "resource",
-          "urn:ietf:params:xml:ns:rlmi");
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties&)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > c (
-          ((f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) &&
-           !(f & ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom))
-          ? static_cast< ::xercesc::DOMDocument* > (d->cloneNode (true))
-          : 0);
-
-        ::xercesc::DOMDocument& doc (c.get () ? *c : *d);
-        const ::xercesc::DOMElement& e (*doc.getDocumentElement ());
-
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom)
-          doc.setUserData (::LinphonePrivate::Xsd::XmlSchema::dom::treeNodeKey,
-                           (c.get () ? &c : &d),
-                           0);
-
-        if (n.name () == "resource" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource > r (
-            ::xsd::cxx::tree::traits< ::LinphonePrivate::Xsd::Rlmi::Resource, char >::create (
-              e, f, 0));
-          return r;
-        }
-
-        throw ::xsd::cxx::tree::unexpected_element < char > (
-          n.name (),
-          n.namespace_ (),
-          "resource",
-          "urn:ietf:params:xml:ns:rlmi");
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::std::string& u,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        h.throw_if_failed< ::xsd::cxx::tree::parsing< char > > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > (
-          ::LinphonePrivate::Xsd::Rlmi::parseInstance (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::std::string& u,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > (
-          ::LinphonePrivate::Xsd::Rlmi::parseInstance (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::std::string& u,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > (
-          ::LinphonePrivate::Xsd::Rlmi::parseInstance (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseInstance (isrc, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseInstance (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseInstance (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     const ::std::string& sid,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseInstance (isrc, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     const ::std::string& sid,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseInstance (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     const ::std::string& sid,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseInstance (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::xercesc::InputSource& i,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        h.throw_if_failed< ::xsd::cxx::tree::parsing< char > > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > (
-          ::LinphonePrivate::Xsd::Rlmi::parseInstance (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::xercesc::InputSource& i,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > (
-          ::LinphonePrivate::Xsd::Rlmi::parseInstance (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::xercesc::InputSource& i,
-                     ::xercesc::DOMErrorHandler& h,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > (
-          ::LinphonePrivate::Xsd::Rlmi::parseInstance (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::xercesc::DOMDocument& doc,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        if (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom)
-        {
-          ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-            static_cast< ::xercesc::DOMDocument* > (doc.cloneNode (true)));
-
-          return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > (
-            ::LinphonePrivate::Xsd::Rlmi::parseInstance (
-              std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-        }
-
-        const ::xercesc::DOMElement& e (*doc.getDocumentElement ());
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (n.name () == "instance" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > r (
-            ::xsd::cxx::tree::traits< ::LinphonePrivate::Xsd::Rlmi::Instance, char >::create (
-              e, f, 0));
-          return r;
-        }
-
-        throw ::xsd::cxx::tree::unexpected_element < char > (
-          n.name (),
-          n.namespace_ (),
-          "instance",
-          "urn:ietf:params:xml:ns:rlmi");
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties&)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > c (
-          ((f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) &&
-           !(f & ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom))
-          ? static_cast< ::xercesc::DOMDocument* > (d->cloneNode (true))
-          : 0);
-
-        ::xercesc::DOMDocument& doc (c.get () ? *c : *d);
-        const ::xercesc::DOMElement& e (*doc.getDocumentElement ());
-
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom)
-          doc.setUserData (::LinphonePrivate::Xsd::XmlSchema::dom::treeNodeKey,
-                           (c.get () ? &c : &d),
-                           0);
-
-        if (n.name () == "instance" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance > r (
-            ::xsd::cxx::tree::traits< ::LinphonePrivate::Xsd::Rlmi::Instance, char >::create (
-              e, f, 0));
-          return r;
-        }
-
-        throw ::xsd::cxx::tree::unexpected_element < char > (
-          n.name (),
-          n.namespace_ (),
-          "instance",
-          "urn:ietf:params:xml:ns:rlmi");
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::std::string& u,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        h.throw_if_failed< ::xsd::cxx::tree::parsing< char > > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > (
-          ::LinphonePrivate::Xsd::Rlmi::parseName (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::std::string& u,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > (
-          ::LinphonePrivate::Xsd::Rlmi::parseName (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::std::string& u,
-                 ::xercesc::DOMErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            u, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > (
-          ::LinphonePrivate::Xsd::Rlmi::parseName (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseName (isrc, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseName (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 ::xercesc::DOMErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::sax::std_input_source isrc (is);
-        return ::LinphonePrivate::Xsd::Rlmi::parseName (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 const ::std::string& sid,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseName (isrc, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 const ::std::string& sid,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0,
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) == 0);
-
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseName (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 const ::std::string& sid,
-                 ::xercesc::DOMErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::xml::sax::std_input_source isrc (is, sid);
-        return ::LinphonePrivate::Xsd::Rlmi::parseName (isrc, h, f, p);
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::xercesc::InputSource& i,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        h.throw_if_failed< ::xsd::cxx::tree::parsing< char > > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > (
-          ::LinphonePrivate::Xsd::Rlmi::parseName (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::xercesc::InputSource& i,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > (
-          ::LinphonePrivate::Xsd::Rlmi::parseName (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::xercesc::InputSource& i,
-                 ::xercesc::DOMErrorHandler& h,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::parse< char > (
-            i, h, p, f));
-
-        if (!d.get ())
-          throw ::xsd::cxx::tree::parsing< char > ();
-
-        return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > (
-          ::LinphonePrivate::Xsd::Rlmi::parseName (
-            std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::xercesc::DOMDocument& doc,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p)
-      {
-        if (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom)
-        {
-          ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-            static_cast< ::xercesc::DOMDocument* > (doc.cloneNode (true)));
-
-          return ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > (
-            ::LinphonePrivate::Xsd::Rlmi::parseName (
-              std::move (d), f | ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom, p));
-        }
-
-        const ::xercesc::DOMElement& e (*doc.getDocumentElement ());
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (n.name () == "name" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > r (
-            ::xsd::cxx::tree::traits< ::LinphonePrivate::Xsd::Rlmi::Name, char >::create (
-              e, f, 0));
-          return r;
-        }
-
-        throw ::xsd::cxx::tree::unexpected_element < char > (
-          n.name (),
-          n.namespace_ (),
-          "name",
-          "urn:ietf:params:xml:ns:rlmi");
-      }
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties&)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > c (
-          ((f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom) &&
-           !(f & ::LinphonePrivate::Xsd::XmlSchema::Flags::own_dom))
-          ? static_cast< ::xercesc::DOMDocument* > (d->cloneNode (true))
-          : 0);
-
-        ::xercesc::DOMDocument& doc (c.get () ? *c : *d);
-        const ::xercesc::DOMElement& e (*doc.getDocumentElement ());
-
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::keep_dom)
-          doc.setUserData (::LinphonePrivate::Xsd::XmlSchema::dom::treeNodeKey,
-                           (c.get () ? &c : &d),
-                           0);
-
-        if (n.name () == "name" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name > r (
-            ::xsd::cxx::tree::traits< ::LinphonePrivate::Xsd::Rlmi::Name, char >::create (
-              e, f, 0));
-          return r;
-        }
-
-        throw ::xsd::cxx::tree::unexpected_element < char > (
-          n.name (),
-          n.namespace_ (),
-          "name",
-          "urn:ietf:params:xml:ns:rlmi");
-      }
     }
   }
 }
@@ -2433,6 +1657,15 @@ namespace LinphonePrivate
 #include <xsd/cxx/tree/error-handler.hxx>
 #include <xsd/cxx/xml/dom/serialization-source.hxx>
 
+#include <xsd/cxx/tree/type-serializer-map.hxx>
+
+namespace _xsd
+{
+  static
+  const ::xsd::cxx::tree::type_serializer_plate< 0, char >
+  type_serializer_plate_init;
+}
+
 namespace LinphonePrivate
 {
   namespace Xsd
@@ -2587,450 +1820,6 @@ namespace LinphonePrivate
         return d;
       }
 
-      void
-      serializeResource (::std::ostream& o,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeResource (s, m, f));
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          h.throw_if_failed< ::xsd::cxx::tree::serialization< char > > ();
-        }
-      }
-
-      void
-      serializeResource (::std::ostream& o,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeResource (s, m, f));
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeResource (::std::ostream& o,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         ::xercesc::DOMErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeResource (s, m, f));
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeResource (::xercesc::XMLFormatTarget& t,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeResource (s, m, f));
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          h.throw_if_failed< ::xsd::cxx::tree::serialization< char > > ();
-        }
-      }
-
-      void
-      serializeResource (::xercesc::XMLFormatTarget& t,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeResource (s, m, f));
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeResource (::xercesc::XMLFormatTarget& t,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         ::xercesc::DOMErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeResource (s, m, f));
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeResource (::xercesc::DOMDocument& d,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags)
-      {
-        ::xercesc::DOMElement& e (*d.getDocumentElement ());
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (n.name () == "resource" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          e << s;
-        }
-        else
-        {
-          throw ::xsd::cxx::tree::unexpected_element < char > (
-            n.name (),
-            n.namespace_ (),
-            "resource",
-            "urn:ietf:params:xml:ns:rlmi");
-        }
-      }
-
-      ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeResource (const ::LinphonePrivate::Xsd::Rlmi::Resource& s,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::serialize< char > (
-            "resource",
-            "urn:ietf:params:xml:ns:rlmi",
-            m, f));
-
-        ::LinphonePrivate::Xsd::Rlmi::serializeResource (*d, s, f);
-        return d;
-      }
-
-      void
-      serializeInstance (::std::ostream& o,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeInstance (s, m, f));
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          h.throw_if_failed< ::xsd::cxx::tree::serialization< char > > ();
-        }
-      }
-
-      void
-      serializeInstance (::std::ostream& o,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeInstance (s, m, f));
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeInstance (::std::ostream& o,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         ::xercesc::DOMErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeInstance (s, m, f));
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeInstance (::xercesc::XMLFormatTarget& t,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeInstance (s, m, f));
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          h.throw_if_failed< ::xsd::cxx::tree::serialization< char > > ();
-        }
-      }
-
-      void
-      serializeInstance (::xercesc::XMLFormatTarget& t,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeInstance (s, m, f));
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeInstance (::xercesc::XMLFormatTarget& t,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         ::xercesc::DOMErrorHandler& h,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         const ::std::string& e,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeInstance (s, m, f));
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeInstance (::xercesc::DOMDocument& d,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags)
-      {
-        ::xercesc::DOMElement& e (*d.getDocumentElement ());
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (n.name () == "instance" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          e << s;
-        }
-        else
-        {
-          throw ::xsd::cxx::tree::unexpected_element < char > (
-            n.name (),
-            n.namespace_ (),
-            "instance",
-            "urn:ietf:params:xml:ns:rlmi");
-        }
-      }
-
-      ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeInstance (const ::LinphonePrivate::Xsd::Rlmi::Instance& s,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::serialize< char > (
-            "instance",
-            "urn:ietf:params:xml:ns:rlmi",
-            m, f));
-
-        ::LinphonePrivate::Xsd::Rlmi::serializeInstance (*d, s, f);
-        return d;
-      }
-
-      void
-      serializeName (::std::ostream& o,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                     const ::std::string& e,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeName (s, m, f));
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          h.throw_if_failed< ::xsd::cxx::tree::serialization< char > > ();
-        }
-      }
-
-      void
-      serializeName (::std::ostream& o,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                     const ::std::string& e,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::xsd::cxx::xml::auto_initializer i (
-          (f & ::LinphonePrivate::Xsd::XmlSchema::Flags::dont_initialize) == 0);
-
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeName (s, m, f));
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeName (::std::ostream& o,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     ::xercesc::DOMErrorHandler& h,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                     const ::std::string& e,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeName (s, m, f));
-        ::xsd::cxx::xml::dom::ostream_format_target t (o);
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeName (::xercesc::XMLFormatTarget& t,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                     const ::std::string& e,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeName (s, m, f));
-
-        ::xsd::cxx::tree::error_handler< char > h;
-
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          h.throw_if_failed< ::xsd::cxx::tree::serialization< char > > ();
-        }
-      }
-
-      void
-      serializeName (::xercesc::XMLFormatTarget& t,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& h,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                     const ::std::string& e,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeName (s, m, f));
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeName (::xercesc::XMLFormatTarget& t,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     ::xercesc::DOMErrorHandler& h,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                     const ::std::string& e,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::LinphonePrivate::Xsd::Rlmi::serializeName (s, m, f));
-        if (!::xsd::cxx::xml::dom::serialize (t, *d, e, h, f))
-        {
-          throw ::xsd::cxx::tree::serialization< char > ();
-        }
-      }
-
-      void
-      serializeName (::xercesc::DOMDocument& d,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags)
-      {
-        ::xercesc::DOMElement& e (*d.getDocumentElement ());
-        const ::xsd::cxx::xml::qualified_name< char > n (
-          ::xsd::cxx::xml::dom::name< char > (e));
-
-        if (n.name () == "name" &&
-            n.namespace_ () == "urn:ietf:params:xml:ns:rlmi")
-        {
-          e << s;
-        }
-        else
-        {
-          throw ::xsd::cxx::tree::unexpected_element < char > (
-            n.name (),
-            n.namespace_ (),
-            "name",
-            "urn:ietf:params:xml:ns:rlmi");
-        }
-      }
-
-      ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeName (const ::LinphonePrivate::Xsd::Rlmi::Name& s,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f)
-      {
-        ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d (
-          ::xsd::cxx::xml::dom::serialize< char > (
-            "name",
-            "urn:ietf:params:xml:ns:rlmi",
-            m, f));
-
-        ::LinphonePrivate::Xsd::Rlmi::serializeName (*d, s, f);
-        return d;
-      }
-
       void
       operator<< (::xercesc::DOMElement& e, const List& i)
       {
@@ -3318,6 +2107,12 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
+#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
+	#pragma GCC diagnostic pop
+#endif
 #if __clang__ || __GNUC__ >= 4
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/rlmi.h b/src/xml/rlmi.h
index 73c8412b4..68855f6cc 100644
--- a/src/xml/rlmi.h
+++ b/src/xml/rlmi.h
@@ -49,14 +49,18 @@
 // Begin prologue.
 //
 #if __clang__ || __GNUC__ >= 4
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wfloat-equal"
-  #pragma GCC diagnostic ignored "-Wsign-conversion"
-  #pragma GCC diagnostic ignored "-Wconversion"
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wfloat-equal"
+	#pragma GCC diagnostic ignored "-Wsign-conversion"
+	#pragma GCC diagnostic ignored "-Wconversion"
 #endif
 #if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wsuggest-override"
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
+#if __GNUC__ >=7
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #endif
 //
 // End prologue.
@@ -243,6 +247,8 @@ namespace LinphonePrivate
       typedef ::xsd::cxx::tree::unexpected_enumerator< char > UnexpectedEnumerator;
       typedef ::xsd::cxx::tree::expected_text_content< char > ExpectedTextContent;
       typedef ::xsd::cxx::tree::no_prefix_mapping< char > NoPrefixMapping;
+      typedef ::xsd::cxx::tree::no_type_info< char > NoTypeInfo;
+      typedef ::xsd::cxx::tree::not_derived< char > NotDerived;
       typedef ::xsd::cxx::tree::serialization< char > Serialization;
 
       // Error handler callback interface.
@@ -460,7 +466,7 @@ namespace LinphonePrivate
         List&
         operator= (const List& x);
 
-        virtual
+        virtual 
         ~List ();
 
         // Implementation.
@@ -581,7 +587,7 @@ namespace LinphonePrivate
         Resource&
         operator= (const Resource& x);
 
-        virtual
+        virtual 
         ~Resource ();
 
         // Implementation.
@@ -743,7 +749,7 @@ namespace LinphonePrivate
         Instance&
         operator= (const Instance& x);
 
-        virtual
+        virtual 
         ~Instance ();
 
         // Implementation.
@@ -813,7 +819,7 @@ namespace LinphonePrivate
         Name&
         operator= (const Name& x);
 
-        virtual
+        virtual 
         ~Name ();
 
         // Implementation.
@@ -1020,285 +1026,6 @@ namespace LinphonePrivate
       parseList (::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d,
                  ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
                  const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse a URI or a local file.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::std::string& uri,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::std::string& uri,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::std::string& uri,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse std::istream.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     const ::std::string& id,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     const ::std::string& id,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::std::istream& is,
-                     const ::std::string& id,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse xercesc::InputSource.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::xercesc::InputSource& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::xercesc::InputSource& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::xercesc::InputSource& is,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse xercesc::DOMDocument.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (const ::xercesc::DOMDocument& d,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Resource >
-      parseResource (::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse a URI or a local file.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::std::string& uri,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::std::string& uri,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::std::string& uri,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse std::istream.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     const ::std::string& id,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     const ::std::string& id,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::std::istream& is,
-                     const ::std::string& id,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse xercesc::InputSource.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::xercesc::InputSource& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::xercesc::InputSource& is,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::xercesc::InputSource& is,
-                     ::xercesc::DOMErrorHandler& eh,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse xercesc::DOMDocument.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (const ::xercesc::DOMDocument& d,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Instance >
-      parseInstance (::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                     const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse a URI or a local file.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::std::string& uri,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::std::string& uri,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::std::string& uri,
-                 ::xercesc::DOMErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse std::istream.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 ::xercesc::DOMErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 const ::std::string& id,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 const ::std::string& id,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::std::istream& is,
-                 const ::std::string& id,
-                 ::xercesc::DOMErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse xercesc::InputSource.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::xercesc::InputSource& is,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::xercesc::InputSource& is,
-                 ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::xercesc::InputSource& is,
-                 ::xercesc::DOMErrorHandler& eh,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      // Parse xercesc::DOMDocument.
-      //
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (const ::xercesc::DOMDocument& d,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
-
-      ::std::unique_ptr< ::LinphonePrivate::Xsd::Rlmi::Name >
-      parseName (::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument > d,
-                 ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
-                 const ::LinphonePrivate::Xsd::XmlSchema::Properties& p = ::LinphonePrivate::Xsd::XmlSchema::Properties ());
     }
   }
 }
@@ -1322,14 +1049,14 @@ namespace LinphonePrivate
 
       void
       serializeList (::std::ostream& os,
-                     const ::LinphonePrivate::Xsd::Rlmi::List& x,
+                     const ::LinphonePrivate::Xsd::Rlmi::List& x, 
                      const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                      const ::std::string& e = "UTF-8",
                      ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
       void
       serializeList (::std::ostream& os,
-                     const ::LinphonePrivate::Xsd::Rlmi::List& x,
+                     const ::LinphonePrivate::Xsd::Rlmi::List& x, 
                      ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
                      const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                      const ::std::string& e = "UTF-8",
@@ -1337,7 +1064,7 @@ namespace LinphonePrivate
 
       void
       serializeList (::std::ostream& os,
-                     const ::LinphonePrivate::Xsd::Rlmi::List& x,
+                     const ::LinphonePrivate::Xsd::Rlmi::List& x, 
                      ::xercesc::DOMErrorHandler& eh,
                      const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                      const ::std::string& e = "UTF-8",
@@ -1348,14 +1075,14 @@ namespace LinphonePrivate
 
       void
       serializeList (::xercesc::XMLFormatTarget& ft,
-                     const ::LinphonePrivate::Xsd::Rlmi::List& x,
+                     const ::LinphonePrivate::Xsd::Rlmi::List& x, 
                      const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                      const ::std::string& e = "UTF-8",
                      ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
       void
       serializeList (::xercesc::XMLFormatTarget& ft,
-                     const ::LinphonePrivate::Xsd::Rlmi::List& x,
+                     const ::LinphonePrivate::Xsd::Rlmi::List& x, 
                      ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
                      const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                      const ::std::string& e = "UTF-8",
@@ -1363,7 +1090,7 @@ namespace LinphonePrivate
 
       void
       serializeList (::xercesc::XMLFormatTarget& ft,
-                     const ::LinphonePrivate::Xsd::Rlmi::List& x,
+                     const ::LinphonePrivate::Xsd::Rlmi::List& x, 
                      ::xercesc::DOMErrorHandler& eh,
                      const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                      const ::std::string& e = "UTF-8",
@@ -1381,211 +1108,7 @@ namespace LinphonePrivate
       //
 
       ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeList (const ::LinphonePrivate::Xsd::Rlmi::List& x,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to std::ostream.
-      //
-
-      void
-      serializeResource (::std::ostream& os,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeResource (::std::ostream& os,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeResource (::std::ostream& os,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         ::xercesc::DOMErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to xercesc::XMLFormatTarget.
-      //
-
-      void
-      serializeResource (::xercesc::XMLFormatTarget& ft,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeResource (::xercesc::XMLFormatTarget& ft,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeResource (::xercesc::XMLFormatTarget& ft,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         ::xercesc::DOMErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to an existing xercesc::DOMDocument.
-      //
-
-      void
-      serializeResource (::xercesc::DOMDocument& d,
-                         const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to a new xercesc::DOMDocument.
-      //
-
-      ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeResource (const ::LinphonePrivate::Xsd::Rlmi::Resource& x,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to std::ostream.
-      //
-
-      void
-      serializeInstance (::std::ostream& os,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeInstance (::std::ostream& os,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeInstance (::std::ostream& os,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         ::xercesc::DOMErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to xercesc::XMLFormatTarget.
-      //
-
-      void
-      serializeInstance (::xercesc::XMLFormatTarget& ft,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeInstance (::xercesc::XMLFormatTarget& ft,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeInstance (::xercesc::XMLFormatTarget& ft,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         ::xercesc::DOMErrorHandler& eh,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         const ::std::string& e = "UTF-8",
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to an existing xercesc::DOMDocument.
-      //
-
-      void
-      serializeInstance (::xercesc::DOMDocument& d,
-                         const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to a new xercesc::DOMDocument.
-      //
-
-      ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeInstance (const ::LinphonePrivate::Xsd::Rlmi::Instance& x,
-                         const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                         ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to std::ostream.
-      //
-
-      void
-      serializeName (::std::ostream& os,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& x,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                     const ::std::string& e = "UTF-8",
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeName (::std::ostream& os,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& x,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                     const ::std::string& e = "UTF-8",
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeName (::std::ostream& os,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& x,
-                     ::xercesc::DOMErrorHandler& eh,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                     const ::std::string& e = "UTF-8",
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to xercesc::XMLFormatTarget.
-      //
-
-      void
-      serializeName (::xercesc::XMLFormatTarget& ft,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& x,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                     const ::std::string& e = "UTF-8",
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeName (::xercesc::XMLFormatTarget& ft,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& x,
-                     ::LinphonePrivate::Xsd::XmlSchema::ErrorHandler& eh,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                     const ::std::string& e = "UTF-8",
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      void
-      serializeName (::xercesc::XMLFormatTarget& ft,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& x,
-                     ::xercesc::DOMErrorHandler& eh,
-                     const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
-                     const ::std::string& e = "UTF-8",
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to an existing xercesc::DOMDocument.
-      //
-
-      void
-      serializeName (::xercesc::DOMDocument& d,
-                     const ::LinphonePrivate::Xsd::Rlmi::Name& x,
-                     ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
-
-      // Serialize to a new xercesc::DOMDocument.
-      //
-
-      ::LinphonePrivate::Xsd::XmlSchema::dom::unique_ptr< ::xercesc::DOMDocument >
-      serializeName (const ::LinphonePrivate::Xsd::Rlmi::Name& x,
+      serializeList (const ::LinphonePrivate::Xsd::Rlmi::List& x, 
                      const ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap& m = ::LinphonePrivate::Xsd::XmlSchema::NamespaceInfomap (),
                      ::LinphonePrivate::Xsd::XmlSchema::Flags f = 0);
 
@@ -1618,6 +1141,12 @@ namespace LinphonePrivate
 
 // Begin epilogue.
 //
+#if __GNUC__ >= 7
+	#pragma GCC diagnostic pop
+#endif
+#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
+	#pragma GCC diagnostic pop
+#endif
 #if __clang__ || __GNUC__ >= 4
 	#pragma GCC diagnostic pop
 #endif
diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 9264dc9cd..7c5162e3d 100644
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -80,7 +80,7 @@ namespace namespace_
   }
 
   // Space
-  //
+  // 
 
   Space::
   Space (Value v)
@@ -117,7 +117,7 @@ namespace namespace_
   Space& Space::
   operator= (Value v)
   {
-    static_cast< ::LinphonePrivate::Xsd::XmlSchema::Ncname& > (*this) =
+    static_cast< ::LinphonePrivate::Xsd::XmlSchema::Ncname& > (*this) = 
     ::LinphonePrivate::Xsd::XmlSchema::Ncname (_xsd_Space_literals_[v]);
 
     return *this;
@@ -125,7 +125,7 @@ namespace namespace_
 
 
   // Lang_member
-  //
+  // 
 
   Lang_member::
   Lang_member (Value v)
@@ -162,7 +162,7 @@ namespace namespace_
   Lang_member& Lang_member::
   operator= (Value v)
   {
-    static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
+    static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) = 
     ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_Lang_member_literals_[v]);
 
     return *this;