--- a/OrthancServer/DicomProtocol/DicomFindAnswers.h	Thu Dec 08 16:29:34 2016 +0100
+++ b/OrthancServer/DicomProtocol/DicomFindAnswers.h	Fri Dec 09 11:24:04 2016 +0100
@@ -39,26 +39,28 @@
   class DicomFindAnswers : public boost::noncopyable
   {
   private:
-    class Answer;
+    Encoding                      encoding_;
+    bool                          isWorklist_;
+    std::vector<ParsedDicomFile*> answers_;
+    bool                          complete_;
 
-    bool                 isWorklist_;
-    std::vector<Answer*> answers_;
-    bool                 complete_;
-
-    Answer& GetAnswerInternal(size_t index) const;
+    void AddAnswerInternal(ParsedDicomFile* answer);
 
   public:
-    DicomFindAnswers(bool isWorklist) : 
-      isWorklist_(isWorklist),
-      complete_(true)
-    {
-    }
+    DicomFindAnswers(bool isWorklist);
 
     ~DicomFindAnswers()
     {
       Clear();
     }
 
+    Encoding GetEncoding() const
+    {
+      return encoding_;
+    }
+
+    void SetEncoding(Encoding encoding);
+
     void SetWorklist(bool isWorklist);
 
     bool IsWorklist() const