--- a/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Mon Oct 08 17:36:54 2018 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Tue Oct 09 12:51:20 2018 +0200
@@ -829,7 +829,9 @@
         if (Configuration::GetOrthancPeer(peer, *it))
         {
           Json::Value jsonPeer = Json::objectValue;
-          // only return the minimum information to identify the destination, do not include "security" information like passwords
+          // only return the minimum information to identify the
+          // destination, do not include "security" information like
+          // passwords
           jsonPeer["Url"] = peer.GetUrl();
           if (!peer.GetUsername().empty())
           {
@@ -911,10 +913,11 @@
       for (OrthancRestApi::SetOfStrings::const_iterator
              it = modalities.begin(); it != modalities.end(); ++it)
       {
-        Json::Value modality;
-        Configuration::GetModalityUsingSymbolicName(*it).ToJson(modality);
-
-        result[*it] = modality;
+        const RemoteModalityParameters& remote = Configuration::GetModalityUsingSymbolicName(*it);
+        
+        Json::Value info;
+        remote.Serialize(info, true /* force advanced format */);
+        result[*it] = info;
       }
       call.GetOutput().AnswerJson(result);
     }
@@ -953,7 +956,7 @@
     if (reader.parse(call.GetBodyData(), call.GetBodyData() + call.GetBodySize(), json))
     {
       RemoteModalityParameters modality;
-      modality.FromJson(json);
+      modality.Unserialize(json);
       Configuration::UpdateModality(context, call.GetUriComponent("id", ""), modality);
       call.GetOutput().AnswerBuffer("", "text/plain");
     }