2010-06-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Removed BDE and bencode
author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> 2010-06-19 17:54:54 +0000
committer: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> 2010-06-19 17:54:54 +0000
commit: cb4e25e4b4a2cfa6349a25586a44c932022e6841 (patch)
tree: 15c0713df0ca88784a0c95a466e3a846192f290b /src
parent: 8ba97188ce42be38b5427e9bd70bb7f5ba8238f9 (diff)
59 files changed, 1038 insertions, 1962 deletions
diff --git a/src/AnnounceList.cc b/src/AnnounceList.cc
index c3ea52be..fa0ccf65 100644
--- a/src/AnnounceList.cc
+++ b/src/AnnounceList.cc
@@ -38,7 +38,6 @@
 
 #include "A2STR.h"
 #include "SimpleRandomizer.h"
-#include "bencode.h"
 #include "util.h"
 
 namespace aria2 {
diff --git a/src/BDE.cc b/src/BDE.cc
deleted file mode 100644
index 92f57b2e..00000000
--- a/src/BDE.cc
+++ /dev/null
@@ -1,223 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2009 Tatsuhiro Tsujikawa
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-
-#include "BDE.h"
-
-namespace aria2 {
-
-const BDE BDE::none;
-
-BDE::BDE():_type(TYPE_NONE), _bobject(new BObject()) {}
-
-BDE::BDE(Integer integer):_type(TYPE_INTEGER),
-                          _bobject(new BInteger(integer)) {}
-
-
-BDE::BDE(const std::string& string):_type(TYPE_STRING),
-                                    _bobject(new BString(std::string(string))) {}
-
-BDE::BDE(const char* cstring):_type(TYPE_STRING),
-                              _bobject(new BString(std::string(cstring))) {}
-
-BDE::BDE(const char* data, size_t length):
-  _type(TYPE_STRING),
-  _bobject(new BString(std::string(&data[0], &data[length]))) {}
-
-BDE::BDE(const unsigned char* data, size_t length):
-  _type(TYPE_STRING),
-  _bobject(new BString(std::string(&data[0], &data[length]))) {}
-
-BDE BDE::dict()
-{
-  BDE bde;
-  bde._type = TYPE_DICT;
-  bde._bobject.reset(new BDict());
-  return bde;
-}
-
-BDE BDE::list()
-{
-  BDE bde;
-  bde._type = TYPE_LIST;
-  bde._bobject.reset(new BList());
-  return bde;
-}
-
-// Test for Null data
-bool BDE::isNone() const
-{
-  return _type == TYPE_NONE;
-}
-
-// Integer Interface
-
-bool BDE::isInteger() const
-{
-  return _type == TYPE_INTEGER;
-}
-
-BDE::Integer BDE::i() const
-{
-  return _bobject->i();
-}
-
-// String Interface
-
-bool BDE::isString() const
-{
-  return _type == TYPE_STRING;
-}
-
-const std::string& BDE::s() const
-{
-  return _bobject->s();
-}
-
-const unsigned char* BDE::uc() const
-{
-  return _bobject->uc();
-}
-
-// Dictionary Interface
-
-bool BDE::isDict() const
-{
-  return _type == TYPE_DICT;
-}
-
-BDE& BDE::operator[](const std::string& key)
-{
-  return _bobject->operator[](key);
-}
-
-const BDE& BDE::operator[](const std::string& key) const
-{
-  if(_bobject->containsKey(key)) {
-    return _bobject->operator[](key);
-  } else {
-    return none;
-  }
-}
-
-bool BDE::containsKey(const std::string& key) const
-{
-  return _bobject->containsKey(key);
-}
-
-void BDE::removeKey(const std::string& key)
-{
-  _bobject->removeKey(key);
-}
-
-BDE::Dict::iterator BDE::dictBegin()
-{
-  return _bobject->dictBegin();
-}
-
-BDE::Dict::const_iterator BDE::dictBegin() const
-{
-  return _bobject->dictBegin();
-}
-
-BDE::Dict::iterator BDE::dictEnd()
-{
-  return _bobject->dictEnd();
-}
-
-BDE::Dict::const_iterator BDE::dictEnd() const
-{
-  return _bobject->dictEnd();
-}
-
-// List Interface
-
-bool BDE::isList() const
-{
-  return _type == TYPE_LIST;
-}
-
-void BDE::append(const BDE& bde)
-{
-  _bobject->append(bde);
-}
-
-void BDE::operator<<(const BDE& bde)
-{
-  _bobject->operator<<(bde);
-}
-
-BDE& BDE::operator[](size_t index)
-{
-  return _bobject->operator[](index);
-}
-
-const BDE& BDE::operator[](size_t index) const
-{
-  return _bobject->operator[](index);
-}
-
-BDE::List::iterator BDE::listBegin()
-{
-  return _bobject->listBegin();
-}
-
-BDE::List::const_iterator BDE::listBegin() const
-{
-  return _bobject->listBegin();
-}
-
-BDE::List::iterator BDE::listEnd()
-{
-  return _bobject->listEnd();
-}
-
-BDE::List::const_iterator BDE::listEnd() const
-{
-  return _bobject->listEnd();
-}
-
-// Callable from List and Dict
-size_t BDE::size() const
-{
-  return _bobject->size();
-}
-
-// Callable from List and Dict
-bool BDE::empty() const
-{
-  return _bobject->empty();
-}
-
-} // namespace aria2
diff --git a/src/BDE.h b/src/BDE.h
deleted file mode 100644
index 939a7237..00000000
--- a/src/BDE.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2009 Tatsuhiro Tsujikawa
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_BDE_H_
-#define _D_BDE_H_
-
-#include "common.h"
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "SharedHandle.h"
-#include "DlAbortEx.h"
-
-namespace aria2 {
-
-class BDE;
-
-class BDE {
-public:
-  typedef std::map<std::string, BDE> Dict;
-  typedef std::vector<BDE> List;
-  typedef int64_t Integer;
-private:
-  enum TYPE{
-    TYPE_NONE,
-    TYPE_INTEGER,
-    TYPE_STRING,
-    TYPE_DICT,
-    TYPE_LIST,
-  };
-
-  class BObject {
-  public:
-    virtual ~BObject() {}
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Integer Interface
-
-    // Returns Integer.
-    virtual Integer i() const
-    {
-      throw DL_ABORT_EX("Not Integer");
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // String Interface
-
-    // Returns std::string.
-    virtual const std::string& s() const
-    {
-      throw DL_ABORT_EX("Not String");
-    } 
-
-    // Returns std::string.data() casted to unsigned char*.
-    // Use s().size() to get length.
-    virtual const unsigned char* uc() const
-    {
-      throw DL_ABORT_EX("Not String");
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Dictionary Interface
-
-    // Returns the reference to BDE object associated with given key.
-    // If the key is not found, new pair with that key is created
-    // using default values, which is then returned. In other words,
-    // this is the same behavior of std::map's operator[].
-    virtual BDE& operator[](const std::string& key)
-    {
-      throw DL_ABORT_EX("Not Dict");
-    }
-
-    // Returns true if the given key is found in dict.
-    virtual bool containsKey(const std::string& key) const
-    {
-      throw DL_ABORT_EX("Not Dict");
-    }
-
-    // Removes specified key from dict.
-    virtual void removeKey(const std::string& key)
-    {
-      throw DL_ABORT_EX("Not Dict");
-    }
-
-    // Returns a read/write iterator that points to the first pair in
-    // the dict.
-    virtual Dict::iterator dictBegin()
-    {
-      throw DL_ABORT_EX("Not Dict");
-    }
-
-    // Returns a read/write read-only iterator that points to one past
-    // the last pair in the dict.
-    virtual Dict::iterator dictEnd()
-    {
-      throw DL_ABORT_EX("Not Dict");
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // List Interface
-    
-    // Appends given bde to list.
-    virtual void append(const BDE& bde)
-    {
-      throw DL_ABORT_EX("Not List");
-    }
-
-    // Alias for append()
-    virtual void operator<<(const BDE& bde)
-    {
-      throw DL_ABORT_EX("Not List");
-    }
-
-    // Returns the reference of the object at the given index.
-    virtual BDE& operator[](size_t index)
-    {
-      throw DL_ABORT_EX("Not List");
-    }
-
-    // Returns a read/write iterator that points to the first object
-    // in list.
-    virtual List::iterator listBegin()
-    {
-      throw DL_ABORT_EX("Not List");
-    }
-
-    // Returns a read/write iterator that points to the one past the
-    // last object in list.
-    virtual List::iterator listEnd()
-    {
-      throw DL_ABORT_EX("Not List");
-    }
-    
-    // Returns size of list or dict.
-    virtual size_t size() const
-    {
-      throw DL_ABORT_EX("Neither Dict nor List");
-    }
-
-    // Returns true if size of list or dict is 0.
-    virtual bool empty() const
-    {
-      throw DL_ABORT_EX("Neither Dict nor List");
-    }
-  };
-
-  class BInteger : public BObject {
-  private:
-    Integer _integer;
-  public:
-    BInteger(Integer i):_integer(i) {}
-
-    virtual BDE::Integer i() const
-    {
-      return _integer;
-    }
-  };
-
-  class BString : public BObject {
-  private:
-    std::string _string;
-  public:
-    BString(const std::string& string):_string(string) {}
-
-    virtual const std::string& s() const
-    {
-      return _string;
-    }
-
-    virtual const unsigned char* uc() const
-    {
-      return reinterpret_cast<const unsigned char*>(_string.data());
-    }
-  };
-
-  class BDict : public BObject {
-  private:
-    Dict _dict;
-  public:
-
-    virtual BDE& operator[](const std::string& key)
-    {
-      return _dict[key];
-    }
-
-    virtual bool containsKey(const std::string& key) const
-    {
-      return _dict.find(key) != _dict.end();
-    }
-
-    virtual void removeKey(const std::string& key)
-    {
-      _dict.erase(key);
-    }
-
-    virtual BDE::Dict::iterator dictBegin()
-    {
-      return _dict.begin();
-    }
-
-    virtual BDE::Dict::iterator dictEnd()
-    {
-      return _dict.end();
-    }
-
-    virtual size_t size() const
-    {
-      return _dict.size();
-    }
-
-    virtual bool empty() const
-    {
-      return _dict.empty();
-    }
-  };
-
-  class BList : public BObject {
-  private:
-    List _list;
-  public:
-    virtual void append(const BDE& bde)
-    {
-      _list.push_back(bde);
-    }
-
-    virtual void operator<<(const BDE& bde)
-    {
-      _list.push_back(bde);
-    }
-
-    virtual BDE& operator[](size_t index)
-    {
-      return _list[index];
-    }
-
-    virtual BDE::List::iterator listBegin()
-    {
-      return _list.begin();
-    }
-
-    virtual BDE::List::iterator listEnd()
-    {
-      return _list.end();
-    }
-
-    virtual size_t size() const
-    {
-      return _list.size();
-    }
-
-    virtual bool empty() const
-    {
-      return _list.empty();
-    }
-  };
-
-  TYPE _type;
-
-  SharedHandle<BObject> _bobject;
-public:
-  BDE();
-
-  static BDE dict();
-
-  static BDE list();
-
-  static const BDE none;
-
-  // Test for Null data
-  // Return true if the type of this object is None.
-  bool isNone() const;
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Integer Interface
-
-  BDE(Integer integer);
-
-  // Returns true if the type of this object is Integer.
-  bool isInteger() const;
-
-  // Returns Integer. Requires this object to be Integer.
-  Integer i() const;
-
-  //////////////////////////////////////////////////////////////////////////////
-  // String Interface
-
-  BDE(const std::string& string);
-
-  // Made explicit to avoid ambiguity with BDE(Integer).
-  explicit BDE(const char* cstring);
-
-  BDE(const char* data, size_t length);
-
-  BDE(const unsigned char* data, size_t length);
-
-  // Returns true if the type of this object is String.
-  bool isString() const;
-
-  // Returns std::string. Requires this object to be String
-  const std::string& s() const;
-
-  // Returns std::string.data() casted to unsigned char*.
-  // Use s().size() to get length.
-  const unsigned char* uc() const;
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Dictionary Interface
-
-  // Returns true if the type of this object is Dict.
-  bool isDict() const;
-
-  // Returns the reference to BDE object associated with given key.
-  // If the key is not found, new pair with that key is created using default
-  // values, which is then returned. In other words, this is the same behavior
-  // of std::map's operator[].
-  // Requires this object to be Dict.
-  BDE& operator[](const std::string& key);
-
-  // Returns the const reference to BDE ojbect associated with given key.
-  // If the key is not found, BDE::none is returned.
-  // Requires this object to be Dict.
-  const BDE& operator[](const std::string& key) const;
-
-  // Returns true if the given key is found in dict.
-  // Requires this object to be Dict.
-  bool containsKey(const std::string& key) const;
-
-  // Removes specified key from dict.
-  // Requires this object to be Dict.
-  void removeKey(const std::string& key);
-
-  // Returns a read/write iterator that points to the first pair in the dict.
-  // Requires this object to be Dict.
-  Dict::iterator dictBegin();
-
-  // Returns a read/write read-only iterator that points to the first pair in
-  // the dict.
-  // Requires this object to be Dict.
-  Dict::const_iterator dictBegin() const;
-
-  // Returns a read/write read-only iterator that points to one past the last
-  // pair in the dict.
-  // Requires this object to be Dict.
-  Dict::iterator dictEnd();
-
-  // Returns a read/write read-only iterator that points to one past the last
-  // pair in the dict.
-  // Requires this object to be Dict.
-  Dict::const_iterator dictEnd() const;
-
-  //////////////////////////////////////////////////////////////////////////////
-  // List Interface
-
-  // Returns true if the type of this object is List.
-  bool isList() const;
-
-  // Appends given bde to list. Required the type of this object to be List.
-  void append(const BDE& bde);
-
-  // Alias for append()
-  void operator<<(const BDE& bde);
-
-  // Returns the reference of the object at the given index. Required this
-  // object to be List.
-  BDE& operator[](size_t index);
-
-  // Returns the const reference of the object at the given index.
-  // Required this object to be List.
-  const BDE& operator[](size_t index) const;
-
-  // Returns a read/write iterator that points to the first object in list.
-  // Required this object to be List.
-  List::iterator listBegin();
-
-  // Returns a read/write read-only iterator that points to the first object
-  // in list. Required this object to be List.
-  List::const_iterator listBegin() const;
-
-  // Returns a read/write iterator that points to the one past the last object
-  // in list. Required this object to be List.
-  List::iterator listEnd();
-
-  // Returns a read/write read-only iterator that points to the one past the
-  // last object in list. Required this object to be List.
-  List::const_iterator listEnd() const;
-
-  // For List type: Returns size of list.
-  // For Dict type: Returns size of dict.
-  size_t size() const;
-
-  // For List type: Returns true if size of list is 0.
-  // For Dict type: Returns true if size of dict is 0.
-  bool empty() const;
-};
-
-} // namespace aria2
-
-#endif // _D_BDE_H_
diff --git a/src/DHTAbstractMessage.cc b/src/DHTAbstractMessage.cc
index 3f408090..ee0c41f1 100644
--- a/src/DHTAbstractMessage.cc
+++ b/src/DHTAbstractMessage.cc
@@ -42,7 +42,7 @@
 #include "DHTMessageFactory.h"
 #include "DHTRoutingTable.h"
 #include "DHTMessageCallback.h"
-#include "bencode.h"
+#include "bencode2.h"
 
 namespace aria2 {
 
@@ -55,12 +55,12 @@ DHTAbstractMessage::~DHTAbstractMessage() {}
 
 std::string DHTAbstractMessage::getBencodedMessage()
 {
-  BDE msgDict = BDE::dict();
-  msgDict[T] = getTransactionID();
-  msgDict[Y] = getType();
-  msgDict[V] = getVersion();
-  fillMessage(msgDict);
-  return bencode::encode(msgDict);
+  Dict msgDict;
+  msgDict.put(T, getTransactionID());
+  msgDict.put(Y, getType());
+  msgDict.put(V, getVersion());
+  fillMessage(&msgDict);
+  return bencode2::encode(&msgDict);
 }
 
 bool DHTAbstractMessage::send()
@@ -75,22 +75,26 @@ bool DHTAbstractMessage::send()
   return r == static_cast<ssize_t>(message.size());
 }
 
-void DHTAbstractMessage::setConnection(const WeakHandle<DHTConnection>& connection)
+void DHTAbstractMessage::setConnection
+(const WeakHandle<DHTConnection>& connection)
 {
   _connection = connection;
 }
 
-void DHTAbstractMessage::setMessageDispatcher(const WeakHandle<DHTMessageDispatcher>& dispatcher)
+void DHTAbstractMessage::setMessageDispatcher
+(const WeakHandle<DHTMessageDispatcher>& dispatcher)
 {
   _dispatcher = dispatcher;
 }
 
-void DHTAbstractMessage::setMessageFactory(const WeakHandle<DHTMessageFactory>& factory)
+void DHTAbstractMessage::setMessageFactory
+(const WeakHandle<DHTMessageFactory>& factory)
 {
   _factory = factory;
 }
 
-void DHTAbstractMessage::setRoutingTable(const WeakHandle<DHTRoutingTable>& routingTable)
+void DHTAbstractMessage::setRoutingTable
+(const WeakHandle<DHTRoutingTable>& routingTable)
 {
   _routingTable = routingTable;
 }
diff --git a/src/DHTAbstractMessage.h b/src/DHTAbstractMessage.h
index bfd33f22..18c6809a 100644
--- a/src/DHTAbstractMessage.h
+++ b/src/DHTAbstractMessage.h
@@ -37,10 +37,10 @@
 
 #include "DHTMessage.h"
 #include "A2STR.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
-class BDE;
 class DHTConnection;
 class DHTMessageDispatcher;
 class DHTMessageFactory;
@@ -66,7 +66,7 @@ public:
 
   virtual const std::string& getType() const = 0;
 
-  virtual void fillMessage(BDE& msgDict) = 0;
+  virtual void fillMessage(Dict* msgDict) = 0;
 
   std::string getBencodedMessage();
 
diff --git a/src/DHTAnnouncePeerMessage.cc b/src/DHTAnnouncePeerMessage.cc
index 434bb13d..f89afacf 100644
--- a/src/DHTAnnouncePeerMessage.cc
+++ b/src/DHTAnnouncePeerMessage.cc
@@ -47,7 +47,6 @@
 #include "DlAbortEx.h"
 #include "BtConstants.h"
 #include "StringFormat.h"
-#include "bencode.h"
 #include "a2functional.h"
 
 namespace aria2 {
@@ -87,13 +86,13 @@ void DHTAnnouncePeerMessage::doReceivedAction()
   getMessageDispatcher()->addMessageToQueue(reply);
 }
 
-BDE DHTAnnouncePeerMessage::getArgument()
+SharedHandle<Dict> DHTAnnouncePeerMessage::getArgument()
 {
-  BDE aDict = BDE::dict();
-  aDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH);
-  aDict[INFO_HASH] = BDE(_infoHash, DHT_ID_LENGTH);
-  aDict[PORT] = _tcpPort;
-  aDict[TOKEN] = _token;
+  SharedHandle<Dict> aDict = Dict::g();
+  aDict->put(DHTMessage::ID, String::g(getLocalNode()->getID(), DHT_ID_LENGTH));
+  aDict->put(INFO_HASH, String::g(_infoHash, DHT_ID_LENGTH));
+  aDict->put(PORT, Integer::g(_tcpPort));
+  aDict->put(TOKEN, _token);
   return aDict;
 }
 
diff --git a/src/DHTAnnouncePeerMessage.h b/src/DHTAnnouncePeerMessage.h
index 0b47b3fe..9011ab75 100644
--- a/src/DHTAnnouncePeerMessage.h
+++ b/src/DHTAnnouncePeerMessage.h
@@ -69,7 +69,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getArgument();
+  virtual SharedHandle<Dict> getArgument();
   
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTAnnouncePeerReplyMessage.cc b/src/DHTAnnouncePeerReplyMessage.cc
index d1088103..1562d78f 100644
--- a/src/DHTAnnouncePeerReplyMessage.cc
+++ b/src/DHTAnnouncePeerReplyMessage.cc
@@ -34,7 +34,6 @@
 /* copyright --> */
 #include "DHTAnnouncePeerReplyMessage.h"
 #include "DHTNode.h"
-#include "bencode.h"
 #include "DHTMessageCallback.h"
 
 namespace aria2 {
@@ -51,10 +50,10 @@ DHTAnnouncePeerReplyMessage::~DHTAnnouncePeerReplyMessage() {}
 
 void DHTAnnouncePeerReplyMessage::doReceivedAction() {}
 
-BDE DHTAnnouncePeerReplyMessage::getResponse()
+SharedHandle<Dict> DHTAnnouncePeerReplyMessage::getResponse()
 {
-  BDE rDict = BDE::dict();
-  rDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH);
+  SharedHandle<Dict> rDict = Dict::g();
+  rDict->put(DHTMessage::ID, String::g(getLocalNode()->getID(), DHT_ID_LENGTH));
   return rDict;
 }
 
diff --git a/src/DHTAnnouncePeerReplyMessage.h b/src/DHTAnnouncePeerReplyMessage.h
index 03d6284f..b6e4be7c 100644
--- a/src/DHTAnnouncePeerReplyMessage.h
+++ b/src/DHTAnnouncePeerReplyMessage.h
@@ -49,7 +49,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getResponse();
+  virtual SharedHandle<Dict> getResponse();
 
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTFindNodeMessage.cc b/src/DHTFindNodeMessage.cc
index a209dda6..7fbe5639 100644
--- a/src/DHTFindNodeMessage.cc
+++ b/src/DHTFindNodeMessage.cc
@@ -42,7 +42,6 @@
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageCallback.h"
 #include "util.h"
-#include "bencode.h"
 
 namespace aria2 {
 
@@ -71,11 +70,11 @@ void DHTFindNodeMessage::doReceivedAction()
   getMessageDispatcher()->addMessageToQueue(reply);
 }
 
-BDE DHTFindNodeMessage::getArgument()
+SharedHandle<Dict> DHTFindNodeMessage::getArgument()
 {
-  BDE aDict = BDE::dict();
-  aDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH);
-  aDict[TARGET_NODE] = BDE(_targetNodeID, DHT_ID_LENGTH);
+  SharedHandle<Dict> aDict = Dict::g();
+  aDict->put(DHTMessage::ID, String::g(getLocalNode()->getID(), DHT_ID_LENGTH));
+  aDict->put(TARGET_NODE, String::g(_targetNodeID, DHT_ID_LENGTH));
   return aDict;
 }
 
diff --git a/src/DHTFindNodeMessage.h b/src/DHTFindNodeMessage.h
index a16263c0..2df5d86e 100644
--- a/src/DHTFindNodeMessage.h
+++ b/src/DHTFindNodeMessage.h
@@ -55,7 +55,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getArgument();
+  virtual SharedHandle<Dict> getArgument();
   
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTFindNodeReplyMessage.cc b/src/DHTFindNodeReplyMessage.cc
index 99542623..bdd186ef 100644
--- a/src/DHTFindNodeReplyMessage.cc
+++ b/src/DHTFindNodeReplyMessage.cc
@@ -44,7 +44,6 @@
 #include "DHTMessageCallback.h"
 #include "bittorrent_helper.h"
 #include "util.h"
-#include "bencode.h"
 
 namespace aria2 {
 
@@ -70,10 +69,10 @@ void DHTFindNodeReplyMessage::doReceivedAction()
   }
 }
 
-BDE DHTFindNodeReplyMessage::getResponse()
+SharedHandle<Dict> DHTFindNodeReplyMessage::getResponse()
 {
-  BDE aDict = BDE::dict();
-  aDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH);
+  SharedHandle<Dict> aDict = Dict::g();
+  aDict->put(DHTMessage::ID, String::g(getLocalNode()->getID(), DHT_ID_LENGTH));
   size_t offset = 0;
   unsigned char buffer[DHTBucket::K*26];
   // TODO if _closestKNodes.size() > DHTBucket::K ??
@@ -87,7 +86,7 @@ BDE DHTFindNodeReplyMessage::getResponse()
       offset += 26;
     }
   }
-  aDict[NODES] = BDE(buffer, offset);
+  aDict->put(NODES, String::g(buffer, offset));
   return aDict;
 }
 
diff --git a/src/DHTFindNodeReplyMessage.h b/src/DHTFindNodeReplyMessage.h
index 7ff88e20..0bc408e1 100644
--- a/src/DHTFindNodeReplyMessage.h
+++ b/src/DHTFindNodeReplyMessage.h
@@ -54,7 +54,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getResponse();
+  virtual SharedHandle<Dict> getResponse();
   
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTGetPeersMessage.cc b/src/DHTGetPeersMessage.cc
index 660c3f7b..608646b2 100644
--- a/src/DHTGetPeersMessage.cc
+++ b/src/DHTGetPeersMessage.cc
@@ -45,7 +45,6 @@
 #include "Peer.h"
 #include "DHTTokenTracker.h"
 #include "util.h"
-#include "bencode.h"
 
 namespace aria2 {
 
@@ -86,11 +85,11 @@ void DHTGetPeersMessage::doReceivedAction()
   getMessageDispatcher()->addMessageToQueue(reply);
 }
 
-BDE DHTGetPeersMessage::getArgument()
+SharedHandle<Dict> DHTGetPeersMessage::getArgument()
 {
-  BDE aDict = BDE::dict();
-  aDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH);
-  aDict[INFO_HASH] = BDE(_infoHash, DHT_ID_LENGTH);
+  SharedHandle<Dict> aDict = Dict::g();
+  aDict->put(DHTMessage::ID, String::g(getLocalNode()->getID(), DHT_ID_LENGTH));
+  aDict->put(INFO_HASH, String::g(_infoHash, DHT_ID_LENGTH));
   return aDict;
 }
 
diff --git a/src/DHTGetPeersMessage.h b/src/DHTGetPeersMessage.h
index e7c5bd6f..a0a8a94b 100644
--- a/src/DHTGetPeersMessage.h
+++ b/src/DHTGetPeersMessage.h
@@ -63,7 +63,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getArgument();
+  virtual SharedHandle<Dict> getArgument();
   
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTGetPeersReplyMessage.cc b/src/DHTGetPeersReplyMessage.cc
index 84720a02..ff621a69 100644
--- a/src/DHTGetPeersReplyMessage.cc
+++ b/src/DHTGetPeersReplyMessage.cc
@@ -45,7 +45,6 @@
 #include "bittorrent_helper.h"
 #include "Peer.h"
 #include "util.h"
-#include "bencode.h"
 #include "a2functional.h"
 
 namespace aria2 {
@@ -73,11 +72,11 @@ void DHTGetPeersReplyMessage::doReceivedAction()
   // Returned peers and nodes are handled in DHTPeerLookupTask.
 }
 
-BDE DHTGetPeersReplyMessage::getResponse()
+SharedHandle<Dict> DHTGetPeersReplyMessage::getResponse()
 {
-  BDE rDict = BDE::dict();
-  rDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH);
-  rDict[TOKEN] = _token;
+  SharedHandle<Dict> rDict = Dict::g();
+  rDict->put(DHTMessage::ID, String::g(getLocalNode()->getID(), DHT_ID_LENGTH));
+  rDict->put(TOKEN, _token);
   if(_values.empty()) {
     size_t offset = 0;
     unsigned char buffer[DHTBucket::K*26];
@@ -91,7 +90,7 @@ BDE DHTGetPeersReplyMessage::getResponse()
         offset += 26;
       }
     }
-    rDict[NODES] = BDE(buffer, offset);
+    rDict->put(NODES, String::g(buffer, offset));
   } else {
     // Limit the size of values list.  The maxmum size of UDP datagram
     // is limited to 65535 bytes. aria2 uses 20bytes token and 2byte
@@ -113,18 +112,18 @@ BDE DHTGetPeersReplyMessage::getResponse()
     // template may get bigger than 87 bytes. So we use 100 as maximum
     // number of peer info that a message can carry.
     static const size_t MAX_VALUES_SIZE = 100;
-    BDE valuesList = BDE::list();
+    SharedHandle<List> valuesList = List::g();
     for(std::vector<SharedHandle<Peer> >::const_iterator i = _values.begin(),
-          eoi = _values.end(); i != eoi && valuesList.size() < MAX_VALUES_SIZE;
+          eoi = _values.end(); i != eoi && valuesList->size() < MAX_VALUES_SIZE;
         ++i) {
       const SharedHandle<Peer>& peer = *i;
       unsigned char buffer[6];
       if(bittorrent::createcompact
          (buffer, peer->getIPAddress(), peer->getPort())) {
-        valuesList << BDE(buffer, sizeof(buffer));
+        valuesList->append(String::g(buffer, sizeof(buffer)));
       }
     }
-    rDict[VALUES] = valuesList;
+    rDict->put(VALUES, valuesList);
   }
   return rDict;  
 }
diff --git a/src/DHTGetPeersReplyMessage.h b/src/DHTGetPeersReplyMessage.h
index 61e3fca9..63045803 100644
--- a/src/DHTGetPeersReplyMessage.h
+++ b/src/DHTGetPeersReplyMessage.h
@@ -64,7 +64,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getResponse();
+  virtual SharedHandle<Dict> getResponse();
 
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTMessageFactory.h b/src/DHTMessageFactory.h
index fb25dc44..f0140f12 100644
--- a/src/DHTMessageFactory.h
+++ b/src/DHTMessageFactory.h
@@ -42,6 +42,7 @@
 
 #include "SharedHandle.h"
 #include "A2STR.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
@@ -50,19 +51,18 @@ class DHTQueryMessage;
 class DHTResponseMessage;
 class DHTNode;
 class Peer;
-class BDE;
 
 class DHTMessageFactory {
 public:
   virtual ~DHTMessageFactory() {}
 
   virtual SharedHandle<DHTQueryMessage>
-  createQueryMessage(const BDE& dict,
+  createQueryMessage(const Dict* dict,
                      const std::string& ipaddr, uint16_t port) = 0;
 
   virtual SharedHandle<DHTResponseMessage>
   createResponseMessage(const std::string& messageType,
-                        const BDE& dict,
+                        const Dict* dict,
                         const std::string& ipaddr, uint16_t port) = 0;
 
   virtual SharedHandle<DHTQueryMessage>
diff --git a/src/DHTMessageFactoryImpl.cc b/src/DHTMessageFactoryImpl.cc
index 3db7e41d..5c1c51cb 100644
--- a/src/DHTMessageFactoryImpl.cc
+++ b/src/DHTMessageFactoryImpl.cc
@@ -61,7 +61,6 @@
 #include "Peer.h"
 #include "Logger.h"
 #include "StringFormat.h"
-#include "bencode.h"
 
 namespace aria2 {
 
@@ -83,11 +82,10 @@ DHTMessageFactoryImpl::getRemoteNode
   return node;
 }
 
-static const BDE& getDictionary(const BDE& dict,
-                                const std::string& key)
+static const Dict* getDictionary(const Dict* dict, const std::string& key)
 {
-  const BDE& d = dict[key];
-  if(d.isDict()) {
+  const Dict* d = asDict(dict->get(key));
+  if(d) {
     return d;
   } else {
     throw DL_ABORT_EX
@@ -95,11 +93,10 @@ static const BDE& getDictionary(const BDE& dict,
   }
 }
 
-static const BDE& getString(const BDE& dict,
-                            const std::string& key)
+static const String* getString(const Dict* dict, const std::string& key)
 {
-  const BDE& c = dict[key];
-  if(c.isString()) {
+  const String* c = asString(dict->get(key));
+  if(c) {
     return c;
   } else {
     throw DL_ABORT_EX
@@ -107,11 +104,10 @@ static const BDE& getString(const BDE& dict,
   }
 }
 
-static const BDE& getInteger(const BDE& dict,
-                             const std::string& key)
+static const Integer* getInteger(const Dict* dict, const std::string& key)
 {
-  const BDE& c = dict[key];
-  if(c.isInteger()) {
+  const Integer* c = asInteger(dict->get(key));
+  if(c) {
     return c;
   } else {
     throw DL_ABORT_EX
@@ -119,10 +115,10 @@ static const BDE& getInteger(const BDE& dict,
   }
 }
 
-static const BDE& getString(const BDE& list, size_t index)
+static const String* getString(const List* list, size_t index)
 {
-  const BDE& c = list[index];
-  if(c.isString()) {
+  const String* c = asString(list->get(index));
+  if(c) {
     return c;
   } else {
     throw DL_ABORT_EX
@@ -131,10 +127,10 @@ static const BDE& getString(const BDE& list, size_t index)
   }
 }
 
-static const BDE& getInteger(const BDE& list, size_t index)
+static const Integer* getInteger(const List* list, size_t index)
 {
-  const BDE& c = list[index];
-  if(c.isInteger()) {
+  const Integer* c = asInteger(list->get(index));
+  if(c) {
     return c;
   } else {
     throw DL_ABORT_EX
@@ -143,11 +139,10 @@ static const BDE& getInteger(const BDE& list, size_t index)
   }
 }
 
-static const BDE& getList(const BDE& dict,
-                          const std::string& key)
+static const List* getList(const Dict* dict, const std::string& key)
 {
-  const BDE& l = dict[key];
-  if(l.isList()) {
+  const List* l = asList(dict->get(key));
+  if(l) {
     return l;
   } else {
     throw DL_ABORT_EX
@@ -155,78 +150,73 @@ static const BDE& getList(const BDE& dict,
   }
 }
 
-void DHTMessageFactoryImpl::validateID(const BDE& id) const
+void DHTMessageFactoryImpl::validateID(const String* id) const
 {
-  if(id.s().size() != DHT_ID_LENGTH) {
+  if(id->s().size() != DHT_ID_LENGTH) {
     throw DL_ABORT_EX
       (StringFormat("Malformed DHT message. Invalid ID length."
                     " Expected:%d, Actual:%d",
-                    DHT_ID_LENGTH, id.s().size()).str());
+                    DHT_ID_LENGTH, id->s().size()).str());
   }
 }
 
-void DHTMessageFactoryImpl::validatePort(const BDE& i) const
+void DHTMessageFactoryImpl::validatePort(const Integer* port) const
 {
-  BDE::Integer port = i.i();
-  if(!(0 < port && port < UINT16_MAX)) {
+  if(!(0 < port->i() && port->i() < UINT16_MAX)) {
     throw DL_ABORT_EX
       (StringFormat("Malformed DHT message. Invalid port=%s",
-                    util::itos(port).c_str()).str());
+                    util::itos(port->i()).c_str()).str());
   }
 }
 
-static void setVersion(const SharedHandle<DHTMessage>& msg, const BDE& dict)
+static void setVersion(const SharedHandle<DHTMessage>& msg, const Dict* dict)
 {
-  const BDE& v = dict[DHTMessage::V];
-  if(v.isString()) {
-    msg->setVersion(v.s());
+  const String* v = asString(dict->get(DHTMessage::V));
+  if(v) {
+    msg->setVersion(v->s());
   } else {
     msg->setVersion(A2STR::NIL);
   }
 }
 
 SharedHandle<DHTQueryMessage> DHTMessageFactoryImpl::createQueryMessage
-(const BDE& dict, const std::string& ipaddr, uint16_t port)
+(const Dict* dict, const std::string& ipaddr, uint16_t port)
 {
-  const BDE& messageType = getString(dict, DHTQueryMessage::Q);
-  const BDE& transactionID = getString(dict, DHTMessage::T);
-  const BDE& y = getString(dict, DHTMessage::Y);
-  const BDE& aDict = getDictionary(dict, DHTQueryMessage::A);
-  if(y.s() != DHTQueryMessage::Q) {
+  const String* messageType = getString(dict, DHTQueryMessage::Q);
+  const String* transactionID = getString(dict, DHTMessage::T);
+  const String* y = getString(dict, DHTMessage::Y);
+  const Dict* aDict = getDictionary(dict, DHTQueryMessage::A);
+  if(y->s() != DHTQueryMessage::Q) {
     throw DL_ABORT_EX("Malformed DHT message. y != q");
   }
-  const BDE& id = getString(aDict, DHTMessage::ID);
+  const String* id = getString(aDict, DHTMessage::ID);
   validateID(id);
-  SharedHandle<DHTNode> remoteNode = getRemoteNode(id.uc(), ipaddr, port);
+  SharedHandle<DHTNode> remoteNode = getRemoteNode(id->uc(), ipaddr, port);
   SharedHandle<DHTQueryMessage> msg;
-  if(messageType.s() == DHTPingMessage::PING) {
-    msg = createPingMessage(remoteNode, transactionID.s());
-  } else if(messageType.s() == DHTFindNodeMessage::FIND_NODE) {
-    const BDE& targetNodeID =
+  if(messageType->s() == DHTPingMessage::PING) {
+    msg = createPingMessage(remoteNode, transactionID->s());
+  } else if(messageType->s() == DHTFindNodeMessage::FIND_NODE) {
+    const String* targetNodeID =
       getString(aDict, DHTFindNodeMessage::TARGET_NODE);
     validateID(targetNodeID);
-    msg = createFindNodeMessage(remoteNode, targetNodeID.uc(),
-                                transactionID.s());
-  } else if(messageType.s() == DHTGetPeersMessage::GET_PEERS) {
-    const BDE& infoHash = 
-      getString(aDict, DHTGetPeersMessage::INFO_HASH);
+    msg = createFindNodeMessage(remoteNode, targetNodeID->uc(),
+                                transactionID->s());
+  } else if(messageType->s() == DHTGetPeersMessage::GET_PEERS) {
+    const String* infoHash =  getString(aDict, DHTGetPeersMessage::INFO_HASH);
     validateID(infoHash);
-    msg = createGetPeersMessage(remoteNode,
-                                infoHash.uc(), transactionID.s());
-  } else if(messageType.s() == DHTAnnouncePeerMessage::ANNOUNCE_PEER) {
-    const BDE& infoHash =
-      getString(aDict, DHTAnnouncePeerMessage::INFO_HASH);
+    msg = createGetPeersMessage(remoteNode, infoHash->uc(), transactionID->s());
+  } else if(messageType->s() == DHTAnnouncePeerMessage::ANNOUNCE_PEER) {
+    const String* infoHash = getString(aDict,DHTAnnouncePeerMessage::INFO_HASH);
     validateID(infoHash);
-    const BDE& port = getInteger(aDict, DHTAnnouncePeerMessage::PORT);
+    const Integer* port = getInteger(aDict, DHTAnnouncePeerMessage::PORT);
     validatePort(port);
-    const BDE& token = getString(aDict, DHTAnnouncePeerMessage::TOKEN);
-    msg = createAnnouncePeerMessage(remoteNode, infoHash.uc(),
-                                    static_cast<uint16_t>(port.i()),
-                                    token.s(), transactionID.s());
+    const String* token = getString(aDict, DHTAnnouncePeerMessage::TOKEN);
+    msg = createAnnouncePeerMessage(remoteNode, infoHash->uc(),
+                                    static_cast<uint16_t>(port->i()),
+                                    token->s(), transactionID->s());
   } else {
-    throw DL_ABORT_EX
-      (StringFormat("Unsupported message type: %s",
-                    messageType.s().c_str()).str());
+    throw DL_ABORT_EX(StringFormat("Unsupported message type: %s",
+                                   messageType->s().c_str()).str());
   }
   setVersion(msg, dict);
   return msg;
@@ -235,20 +225,20 @@ SharedHandle<DHTQueryMessage> DHTMessageFactoryImpl::createQueryMessage
 SharedHandle<DHTResponseMessage>
 DHTMessageFactoryImpl::createResponseMessage
 (const std::string& messageType,
- const BDE& dict,
+ const Dict* dict,
  const std::string& ipaddr,
  uint16_t port)
 {
-  const BDE& transactionID = getString(dict, DHTMessage::T);
-  const BDE& y = getString(dict, DHTMessage::Y);
-  if(y.s() == DHTUnknownMessage::E) {
+  const String* transactionID = getString(dict, DHTMessage::T);
+  const String* y = getString(dict, DHTMessage::Y);
+  if(y->s() == DHTUnknownMessage::E) {
     // for now, just report error message arrived and throw exception.
-    const BDE& e = getList(dict, DHTUnknownMessage::E);
-    if(e.size() == 2) {
+    const List* e = getList(dict, DHTUnknownMessage::E);
+    if(e->size() == 2) {
       if(_logger->info()) {
         _logger->info("Received Error DHT message. code=%s, msg=%s",
-                      util::itos(getInteger(e, 0).i()).c_str(),
-                      util::percentEncode(getString(e, 1).s()).c_str());
+                      util::itos(getInteger(e, 0)->i()).c_str(),
+                      util::percentEncode(getString(e, 1)->s()).c_str());
       }
     } else {
       if(_logger->debug()) {
@@ -256,36 +246,38 @@ DHTMessageFactoryImpl::createResponseMessage
       }
     }
     throw DL_ABORT_EX("Received Error DHT message.");
-  } else if(y.s() != DHTResponseMessage::R) {
+  } else if(y->s() != DHTResponseMessage::R) {
     throw DL_ABORT_EX
       (StringFormat("Malformed DHT message. y != r: y=%s",
-                    util::percentEncode(y.s()).c_str()).str());
+                    util::percentEncode(y->s()).c_str()).str());
   }
-  const BDE& rDict = getDictionary(dict, DHTResponseMessage::R);
-  const BDE& id = getString(rDict, DHTMessage::ID);
+  const Dict* rDict = getDictionary(dict, DHTResponseMessage::R);
+  const String* id = getString(rDict, DHTMessage::ID);
   validateID(id);
-  SharedHandle<DHTNode> remoteNode = getRemoteNode(id.uc(), ipaddr, port);
+  SharedHandle<DHTNode> remoteNode = getRemoteNode(id->uc(), ipaddr, port);
   SharedHandle<DHTResponseMessage> msg;
   if(messageType == DHTPingReplyMessage::PING) {
-    msg = createPingReplyMessage(remoteNode, id.uc(), transactionID.s());
+    msg = createPingReplyMessage(remoteNode, id->uc(), transactionID->s());
   } else if(messageType == DHTFindNodeReplyMessage::FIND_NODE) {
-    msg = createFindNodeReplyMessage(remoteNode, dict, transactionID.s());
+    msg = createFindNodeReplyMessage(remoteNode, dict, transactionID->s());
   } else if(messageType == DHTGetPeersReplyMessage::GET_PEERS) {
-    const BDE& valuesList = rDict[DHTGetPeersReplyMessage::VALUES];
-    if(valuesList.isList()) {
-      msg = createGetPeersReplyMessageWithValues(remoteNode, dict,
-                                                 transactionID.s());
+    const List* valuesList =
+      asList(rDict->get(DHTGetPeersReplyMessage::VALUES));
+    if(valuesList) {
+      msg = createGetPeersReplyMessageWithValues
+        (remoteNode, dict, transactionID->s());
     } else {
-      const BDE& nodes = rDict[DHTGetPeersReplyMessage::NODES];
-      if(nodes.isString()) {
-        msg = createGetPeersReplyMessageWithNodes(remoteNode, dict,
-                                                   transactionID.s());
+      const String* nodes = asString
+        (rDict->get(DHTGetPeersReplyMessage::NODES));
+      if(nodes) {
+        msg = createGetPeersReplyMessageWithNodes
+          (remoteNode, dict, transactionID->s());
       } else {
         throw DL_ABORT_EX("Malformed DHT message: missing nodes/values");
       }
     }
   } else if(messageType == DHTAnnouncePeerReplyMessage::ANNOUNCE_PEER) {
-    msg = createAnnouncePeerReplyMessage(remoteNode, transactionID.s());
+    msg = createAnnouncePeerReplyMessage(remoteNode, transactionID->s());
   } else {
     throw DL_ABORT_EX
       (StringFormat("Unsupported message type: %s", messageType.c_str()).str());
@@ -307,7 +299,8 @@ static const std::string& getDefaultVersion()
   return version;
 }
 
-void DHTMessageFactoryImpl::setCommonProperty(const SharedHandle<DHTAbstractMessage>& m)
+void DHTMessageFactoryImpl::setCommonProperty
+(const SharedHandle<DHTAbstractMessage>& m)
 {
   m->setConnection(_connection);
   m->setMessageDispatcher(_dispatcher);
@@ -320,7 +313,8 @@ void DHTMessageFactoryImpl::setCommonProperty(const SharedHandle<DHTAbstractMess
 SharedHandle<DHTQueryMessage> DHTMessageFactoryImpl::createPingMessage
 (const SharedHandle<DHTNode>& remoteNode, const std::string& transactionID)
 {
-  SharedHandle<DHTPingMessage> m(new DHTPingMessage(_localNode, remoteNode, transactionID));
+  SharedHandle<DHTPingMessage> m
+    (new DHTPingMessage(_localNode, remoteNode, transactionID));
   setCommonProperty(m);
   return m;
 }
@@ -385,14 +379,14 @@ DHTMessageFactoryImpl::extractNodes(const unsigned char* src, size_t length)
 SharedHandle<DHTResponseMessage>
 DHTMessageFactoryImpl::createFindNodeReplyMessage
 (const SharedHandle<DHTNode>& remoteNode,
- const BDE& dict,
+ const Dict* dict,
  const std::string& transactionID)
 {
-  const BDE& nodesData =
+  const String* nodesData =
     getString(getDictionary(dict, DHTResponseMessage::R),
               DHTFindNodeReplyMessage::NODES);
   std::vector<SharedHandle<DHTNode> > nodes =
-    extractNodes(nodesData.uc(), nodesData.s().size());
+    extractNodes(nodesData->uc(), nodesData->s().size());
   return createFindNodeReplyMessage(remoteNode, nodes, transactionID);
 }
 
@@ -413,17 +407,16 @@ DHTMessageFactoryImpl::createGetPeersMessage
 SharedHandle<DHTResponseMessage>
 DHTMessageFactoryImpl::createGetPeersReplyMessageWithNodes
 (const SharedHandle<DHTNode>& remoteNode,
- const BDE& dict,
+ const Dict* dict,
  const std::string& transactionID)
 {
-  const BDE& rDict = getDictionary(dict, DHTResponseMessage::R);
-  const BDE& nodesData = getString(rDict,
-                                   DHTGetPeersReplyMessage::NODES);
-  std::vector<SharedHandle<DHTNode> > nodes =
-    extractNodes(nodesData.uc(), nodesData.s().size());
-  const BDE& token = getString(rDict, DHTGetPeersReplyMessage::TOKEN);
-  return createGetPeersReplyMessage(remoteNode, nodes, token.s(),
-                                    transactionID);
+  const Dict* rDict = getDictionary(dict, DHTResponseMessage::R);
+  const String* nodesData = getString(rDict, DHTGetPeersReplyMessage::NODES);
+  std::vector<SharedHandle<DHTNode> > nodes = extractNodes
+    (nodesData->uc(), nodesData->s().size());
+  const String* token = getString(rDict, DHTGetPeersReplyMessage::TOKEN);
+  return createGetPeersReplyMessage
+    (remoteNode, nodes, token->s(), transactionID);
 }
 
 SharedHandle<DHTResponseMessage>
@@ -443,26 +436,26 @@ DHTMessageFactoryImpl::createGetPeersReplyMessage
 SharedHandle<DHTResponseMessage>
 DHTMessageFactoryImpl::createGetPeersReplyMessageWithValues
 (const SharedHandle<DHTNode>& remoteNode,
- const BDE& dict,
+ const Dict* dict,
  const std::string& transactionID)
 {
-  const BDE& rDict = getDictionary(dict, DHTResponseMessage::R);
-  const BDE& valuesList = getList(rDict,
+  const Dict* rDict = getDictionary(dict, DHTResponseMessage::R);
+  const List* valuesList = getList(rDict,
                                   DHTGetPeersReplyMessage::VALUES);
   std::vector<SharedHandle<Peer> > peers;
-  for(BDE::List::const_iterator i = valuesList.listBegin(),
-        eoi = valuesList.listEnd(); i != eoi; ++i) {
-    const BDE& data = *i;
-    if(data.isString() && data.s().size() == 6) {
+  for(List::ValueType::const_iterator i = valuesList->begin(),
+        eoi = valuesList->end(); i != eoi; ++i) {
+    const String* data = asString(*i);
+    if(data && data->s().size() == 6) {
       std::pair<std::string, uint16_t> addr =
-        bittorrent::unpackcompact(data.uc());
+        bittorrent::unpackcompact(data->uc());
       SharedHandle<Peer> peer(new Peer(addr.first, addr.second));
       peers.push_back(peer);
     }
   }
-  const BDE& token = getString(rDict, DHTGetPeersReplyMessage::TOKEN);
-  return createGetPeersReplyMessage(remoteNode, peers, token.s(),
-                                    transactionID);
+  const String* token = getString(rDict, DHTGetPeersReplyMessage::TOKEN);
+  return createGetPeersReplyMessage
+    (remoteNode, peers, token->s(), transactionID);
 }
 
 SharedHandle<DHTResponseMessage>
diff --git a/src/DHTMessageFactoryImpl.h b/src/DHTMessageFactoryImpl.h
index 2aed434d..2d01297e 100644
--- a/src/DHTMessageFactoryImpl.h
+++ b/src/DHTMessageFactoryImpl.h
@@ -69,9 +69,9 @@ private:
   SharedHandle<DHTNode> getRemoteNode
   (const unsigned char* id, const std::string& ipaddr, uint16_t port) const;
 
-  void validateID(const BDE& id) const;
+  void validateID(const String* id) const;
 
-  void validatePort(const BDE& i) const;
+  void validatePort(const Integer* i) const;
 
   std::vector<SharedHandle<DHTNode> >
   extractNodes(const unsigned char* src, size_t length);
@@ -84,12 +84,12 @@ public:
   virtual ~DHTMessageFactoryImpl();
 
   virtual SharedHandle<DHTQueryMessage>
-  createQueryMessage(const BDE& dict,
+  createQueryMessage(const Dict* dict,
                      const std::string& ipaddr, uint16_t port);
 
   virtual SharedHandle<DHTResponseMessage>
   createResponseMessage(const std::string& messageType,
-                        const BDE& dict,
+                        const Dict* dict,
                         const std::string& ipaddr, uint16_t port);
 
   virtual SharedHandle<DHTQueryMessage>
@@ -108,7 +108,7 @@ public:
 
   SharedHandle<DHTResponseMessage>
   createFindNodeReplyMessage(const SharedHandle<DHTNode>& remoteNode,
-                             const BDE& dict,
+                             const Dict* dict,
                              const std::string& transactionID);
 
 
@@ -132,7 +132,7 @@ public:
 
   SharedHandle<DHTResponseMessage>
   createGetPeersReplyMessageWithNodes(const SharedHandle<DHTNode>& remoteNode,
-                                      const BDE& dict,
+                                      const Dict* dict,
                                       const std::string& transactionID);
 
   virtual SharedHandle<DHTResponseMessage>
@@ -144,7 +144,7 @@ public:
 
   SharedHandle<DHTResponseMessage>
   createGetPeersReplyMessageWithValues(const SharedHandle<DHTNode>& remoteNode,
-                                       const BDE& dict,
+                                       const Dict* dict,
                                        const std::string& transactionID);
 
   virtual SharedHandle<DHTQueryMessage>
diff --git a/src/DHTMessageReceiver.cc b/src/DHTMessageReceiver.cc
index 3269d0a8..273d35ad 100644
--- a/src/DHTMessageReceiver.cc
+++ b/src/DHTMessageReceiver.cc
@@ -51,7 +51,7 @@
 #include "LogFactory.h"
 #include "Logger.h"
 #include "util.h"
-#include "bencode.h"
+#include "bencode2.h"
 
 namespace aria2 {
 
@@ -75,11 +75,12 @@ SharedHandle<DHTMessage> DHTMessageReceiver::receiveMessage()
       return SharedHandle<DHTMessage>();
     }
     bool isReply = false;
-    const BDE dict = bencode::decode(data, length);
-    if(dict.isDict()) {
-      const BDE& y = dict[DHTMessage::Y];
-      if(y.isString()) {
-        if(y.s() == DHTResponseMessage::R || y.s() == DHTUnknownMessage::E) {
+    SharedHandle<ValueBase> decoded = bencode2::decode(data, length);
+    const Dict* dict = asDict(decoded);
+    if(dict) {
+      const String* y = asString(dict->get(DHTMessage::Y));
+      if(y) {
+        if(y->s() == DHTResponseMessage::R || y->s() == DHTUnknownMessage::E) {
           isReply = true;
         }
       } else {
diff --git a/src/DHTMessageTracker.cc b/src/DHTMessageTracker.cc
index 02c582bc..edd3163a 100644
--- a/src/DHTMessageTracker.cc
+++ b/src/DHTMessageTracker.cc
@@ -48,7 +48,6 @@
 #include "DlAbortEx.h"
 #include "DHTConstants.h"
 #include "StringFormat.h"
-#include "bencode.h"
 
 namespace aria2 {
 
@@ -65,20 +64,20 @@ void DHTMessageTracker::addMessage(const SharedHandle<DHTMessage>& message, time
 
 std::pair<SharedHandle<DHTResponseMessage>, SharedHandle<DHTMessageCallback> >
 DHTMessageTracker::messageArrived
-(const BDE& dict, const std::string& ipaddr, uint16_t port)
+(const Dict* dict, const std::string& ipaddr, uint16_t port)
 {
-  const BDE& tid = dict[DHTMessage::T];
-  if(!tid.isString()) {
+  const String* tid = asString(dict->get(DHTMessage::T));
+  if(!tid) {
     throw DL_ABORT_EX(StringFormat("Malformed DHT message. From:%s:%u",
                                    ipaddr.c_str(), port).str());
   }
   if(_logger->debug()) {
     _logger->debug("Searching tracker entry for TransactionID=%s, Remote=%s:%u",
-                   util::toHex(tid.s()).c_str(), ipaddr.c_str(), port);
+                   util::toHex(tid->s()).c_str(), ipaddr.c_str(), port);
   }
   for(std::deque<SharedHandle<DHTMessageTrackerEntry> >::iterator i =
         _entries.begin(), eoi = _entries.end(); i != eoi; ++i) {
-    if((*i)->match(tid.s(), ipaddr, port)) {
+    if((*i)->match(tid->s(), ipaddr, port)) {
       SharedHandle<DHTMessageTrackerEntry> entry = *i;
       _entries.erase(i);
       if(_logger->debug()) {
@@ -162,12 +161,14 @@ size_t DHTMessageTracker::countEntry() const
   return _entries.size();
 }
 
-void DHTMessageTracker::setRoutingTable(const SharedHandle<DHTRoutingTable>& routingTable)
+void DHTMessageTracker::setRoutingTable
+(const SharedHandle<DHTRoutingTable>& routingTable)
 {
   _routingTable = routingTable;
 }
 
-void DHTMessageTracker::setMessageFactory(const SharedHandle<DHTMessageFactory>& factory)
+void DHTMessageTracker::setMessageFactory
+(const SharedHandle<DHTMessageFactory>& factory)
 {
   _factory = factory;
 }
diff --git a/src/DHTMessageTracker.h b/src/DHTMessageTracker.h
index c3d36062..c8c73b72 100644
--- a/src/DHTMessageTracker.h
+++ b/src/DHTMessageTracker.h
@@ -42,6 +42,7 @@
 
 #include "SharedHandle.h"
 #include "a2time.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
@@ -52,7 +53,6 @@ class DHTRoutingTable;
 class DHTMessageFactory;
 class DHTMessageTrackerEntry;
 class Logger;
-class BDE;
 
 class DHTMessageTracker {
 private:
@@ -74,7 +74,7 @@ public:
                   SharedHandle<DHTMessageCallback>());
 
   std::pair<SharedHandle<DHTResponseMessage>, SharedHandle<DHTMessageCallback> >
-  messageArrived(const BDE& dict,
+  messageArrived(const Dict* dict,
                  const std::string& ipaddr, uint16_t port);
 
   void handleTimeout();
diff --git a/src/DHTPingMessage.cc b/src/DHTPingMessage.cc
index 5104940e..6038aab3 100644
--- a/src/DHTPingMessage.cc
+++ b/src/DHTPingMessage.cc
@@ -38,7 +38,6 @@
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageFactory.h"
 #include "DHTMessageCallback.h"
-#include "bencode.h"
 
 namespace aria2 {
 
@@ -60,10 +59,10 @@ void DHTPingMessage::doReceivedAction()
   getMessageDispatcher()->addMessageToQueue(reply);
 }
 
-BDE DHTPingMessage::getArgument()
+SharedHandle<Dict> DHTPingMessage::getArgument()
 {
-  BDE aDict = BDE::dict();
-  aDict[DHTMessage::ID] = BDE(getLocalNode()->getID(), DHT_ID_LENGTH);
+  SharedHandle<Dict> aDict = Dict::g();
+  aDict->put(DHTMessage::ID, String::g(getLocalNode()->getID(), DHT_ID_LENGTH));
   return aDict;
 }
 
diff --git a/src/DHTPingMessage.h b/src/DHTPingMessage.h
index 983e3211..93e00a09 100644
--- a/src/DHTPingMessage.h
+++ b/src/DHTPingMessage.h
@@ -50,7 +50,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getArgument();
+  virtual SharedHandle<Dict> getArgument();
 
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTPingReplyMessage.cc b/src/DHTPingReplyMessage.cc
index f004a037..7420fd2a 100644
--- a/src/DHTPingReplyMessage.cc
+++ b/src/DHTPingReplyMessage.cc
@@ -37,17 +37,17 @@
 #include <cstring>
 
 #include "DHTNode.h"
-#include "bencode.h"
 #include "DHTMessageCallback.h"
 
 namespace aria2 {
 
 const std::string DHTPingReplyMessage::PING("ping");
 
-DHTPingReplyMessage::DHTPingReplyMessage(const SharedHandle<DHTNode>& localNode,
-                                         const SharedHandle<DHTNode>& remoteNode,
-                                         const unsigned char* id,
-                                         const std::string& transactionID):
+DHTPingReplyMessage::DHTPingReplyMessage
+(const SharedHandle<DHTNode>& localNode,
+ const SharedHandle<DHTNode>& remoteNode,
+ const unsigned char* id,
+ const std::string& transactionID):
   DHTResponseMessage(localNode, remoteNode, transactionID)
 {
   memcpy(_id, id, DHT_ID_LENGTH);
@@ -57,10 +57,10 @@ DHTPingReplyMessage::~DHTPingReplyMessage() {}
 
 void DHTPingReplyMessage::doReceivedAction() {}
 
-BDE DHTPingReplyMessage::getResponse()
+SharedHandle<Dict> DHTPingReplyMessage::getResponse()
 {
-  BDE rDict = BDE::dict();
-  rDict[DHTMessage::ID] = BDE(_id, DHT_ID_LENGTH);
+  SharedHandle<Dict> rDict = Dict::g();
+  rDict->put(DHTMessage::ID, String::g(_id, DHT_ID_LENGTH));
   return rDict;
 }
 
diff --git a/src/DHTPingReplyMessage.h b/src/DHTPingReplyMessage.h
index 00a8e699..d9660bd5 100644
--- a/src/DHTPingReplyMessage.h
+++ b/src/DHTPingReplyMessage.h
@@ -53,7 +53,7 @@ public:
 
   virtual void doReceivedAction();
 
-  virtual BDE getResponse();
+  virtual SharedHandle<Dict> getResponse();
 
   virtual const std::string& getMessageType() const;
 
diff --git a/src/DHTQueryMessage.cc b/src/DHTQueryMessage.cc
index 7c91748a..61e3fba6 100644
--- a/src/DHTQueryMessage.cc
+++ b/src/DHTQueryMessage.cc
@@ -35,7 +35,6 @@
 #include "DHTQueryMessage.h"
 #include "DHTNode.h"
 #include "util.h"
-#include "bencode.h"
 #include "a2functional.h"
 
 namespace aria2 {
@@ -56,10 +55,10 @@ const std::string& DHTQueryMessage::getType() const
   return Q;
 }
 
-void DHTQueryMessage::fillMessage(BDE& msgDict)
+void DHTQueryMessage::fillMessage(Dict* msgDict)
 {
-  msgDict[Q] = getMessageType();
-  msgDict[A] = getArgument();
+  msgDict->put(Q, getMessageType());
+  msgDict->put(A, getArgument());
 }
 
 bool DHTQueryMessage::isReply() const
diff --git a/src/DHTQueryMessage.h b/src/DHTQueryMessage.h
index 2cc0cab8..8a65e834 100644
--- a/src/DHTQueryMessage.h
+++ b/src/DHTQueryMessage.h
@@ -37,6 +37,7 @@
 
 #include "DHTAbstractMessage.h"
 #include "A2STR.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
@@ -52,9 +53,9 @@ public:
 
   virtual const std::string& getType() const;
 
-  virtual void fillMessage(BDE& msgDict);
+  virtual void fillMessage(Dict* msgDict);
 
-  virtual BDE getArgument() = 0;
+  virtual SharedHandle<Dict> getArgument() = 0;
   
   virtual bool isReply() const;
 
diff --git a/src/DHTResponseMessage.cc b/src/DHTResponseMessage.cc
index e20e651b..03fcbde7 100644
--- a/src/DHTResponseMessage.cc
+++ b/src/DHTResponseMessage.cc
@@ -35,7 +35,6 @@
 #include "DHTResponseMessage.h"
 #include "DHTNode.h"
 #include "util.h"
-#include "bencode.h"
 #include "a2functional.h"
 
 namespace aria2 {
@@ -54,9 +53,9 @@ const std::string& DHTResponseMessage::getType() const
   return R;
 }
 
-void DHTResponseMessage::fillMessage(BDE& msgDict)
+void DHTResponseMessage::fillMessage(Dict* msgDict)
 {
-  msgDict[R] = getResponse();
+  msgDict->put(R, getResponse());
 }
 
 bool DHTResponseMessage::isReply() const
diff --git a/src/DHTResponseMessage.h b/src/DHTResponseMessage.h
index 6f466368..1300236c 100644
--- a/src/DHTResponseMessage.h
+++ b/src/DHTResponseMessage.h
@@ -37,6 +37,7 @@
 
 #include "DHTAbstractMessage.h"
 #include "A2STR.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
@@ -54,9 +55,9 @@ public:
 
   virtual const std::string& getType() const;
 
-  virtual void fillMessage(BDE& msgDict);
+  virtual void fillMessage(Dict* msgDict);
 
-  virtual BDE getResponse() = 0;
+  virtual SharedHandle<Dict> getResponse() = 0;
   
   virtual bool isReply() const;
 
diff --git a/src/DefaultExtensionMessageFactory.cc b/src/DefaultExtensionMessageFactory.cc
index 6ce8de84..805a56b6 100644
--- a/src/DefaultExtensionMessageFactory.cc
+++ b/src/DefaultExtensionMessageFactory.cc
@@ -49,10 +49,10 @@
 #include "UTMetadataDataExtensionMessage.h"
 #include "UTMetadataRejectExtensionMessage.h"
 #include "message.h"
-#include "bencode.h"
 #include "PieceStorage.h"
 #include "UTMetadataRequestTracker.h"
 #include "RequestGroup.h"
+#include "bencode2.h"
 
 namespace aria2 {
 
@@ -74,7 +74,8 @@ DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t
   uint8_t extensionMessageID = *data;
   if(extensionMessageID == 0) {
     // handshake
-    HandshakeExtensionMessageHandle m = HandshakeExtensionMessage::create(data, length);
+    HandshakeExtensionMessageHandle m =
+      HandshakeExtensionMessage::create(data, length);
     m->setPeer(_peer);
     m->setDownloadContext(_dctx);
     return m;
@@ -97,23 +98,24 @@ DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t
                                        "ut_metadata", length).str());
       }
       size_t end;
-      BDE dict = bencode::decode(data+1, length-1, end);
-      if(!dict.isDict()) {
+      SharedHandle<ValueBase> decoded = bencode2::decode(data+1, length-1, end);
+      const Dict* dict = asDict(decoded);
+      if(!dict) {
         throw DL_ABORT_EX("Bad ut_metadata: dictionary not found");
       }
-      const BDE& msgType = dict["msg_type"];
-      if(!msgType.isInteger()) {
+      const Integer* msgType = asInteger(dict->get("msg_type"));
+      if(!msgType) {
         throw DL_ABORT_EX("Bad ut_metadata: msg_type not found");
       }
-      const BDE& index = dict["piece"];
-      if(!index.isInteger()) {
+      const Integer* index = asInteger(dict->get("piece"));
+      if(!index) {
         throw DL_ABORT_EX("Bad ut_metadata: piece not found");
       }
-      switch(msgType.i()) {
+      switch(msgType->i()) {
       case 0: {
         SharedHandle<UTMetadataRequestExtensionMessage> m
           (new UTMetadataRequestExtensionMessage(extensionMessageID));
-        m->setIndex(index.i());
+        m->setIndex(index->i());
         m->setDownloadContext(_dctx);
         m->setPeer(_peer);
         m->setBtMessageFactory(_messageFactory);
@@ -124,14 +126,14 @@ DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t
         if(end == length) {
           throw DL_ABORT_EX("Bad ut_metadata data: data not found");
         }
-        const BDE& totalSize = dict["total_size"];
-        if(!totalSize.isInteger()) {
+        const Integer* totalSize = asInteger(dict->get("total_size"));
+        if(!totalSize) {
           throw DL_ABORT_EX("Bad ut_metadata data: total_size not found");
         }
         SharedHandle<UTMetadataDataExtensionMessage> m
           (new UTMetadataDataExtensionMessage(extensionMessageID));
-        m->setIndex(index.i());
-        m->setTotalSize(totalSize.i());
+        m->setIndex(index->i());
+        m->setTotalSize(totalSize->i());
         m->setData(std::string(&data[1+end], &data[length]));
         m->setUTMetadataRequestTracker(_tracker);
         m->setPieceStorage(_dctx->getOwnerRequestGroup()->getPieceStorage());
@@ -141,17 +143,18 @@ DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t
       case 2: {
         SharedHandle<UTMetadataRejectExtensionMessage> m
           (new UTMetadataRejectExtensionMessage(extensionMessageID));
-        m->setIndex(index.i());
+        m->setIndex(index->i());
         // No need to inject tracker because peer will be disconnected.
         return m;
       }
       default:
         throw DL_ABORT_EX(StringFormat("Bad ut_metadata: unknown msg_type=%u",
-                                       msgType.i()).str());
+                                       msgType->i()).str());
       }
     } else {
       throw DL_ABORT_EX
-        (StringFormat("Unsupported extension message received. extensionMessageID=%u, extensionName=%s",
+        (StringFormat("Unsupported extension message received."
+                      " extensionMessageID=%u, extensionName=%s",
                       extensionMessageID, extensionName.c_str()).str());
     }
   }
diff --git a/src/ExpatXmlRpcRequestProcessor.cc b/src/ExpatXmlRpcRequestProcessor.cc
index 924f032a..df89eb10 100644
--- a/src/ExpatXmlRpcRequestProcessor.cc
+++ b/src/ExpatXmlRpcRequestProcessor.cc
@@ -114,7 +114,11 @@ XmlRpcRequestProcessor::parseMemory(const std::string& xml)
   if(r == XML_STATUS_ERROR) {
     throw DL_ABORT_EX(MSG_CANNOT_PARSE_XML_RPC_REQUEST);
   }
-  return XmlRpcRequest(_stm->getMethodName(), _stm->getCurrentFrameValue());
+  if(!asList(_stm->getCurrentFrameValue())) {
+    throw DL_ABORT_EX("Bad XML-RPC parameter list");
+  }
+  return XmlRpcRequest(_stm->getMethodName(),
+                       static_pointer_cast<List>(_stm->getCurrentFrameValue()));
 }
 
 } // namespace xmlrpc
diff --git a/src/HandshakeExtensionMessage.cc b/src/HandshakeExtensionMessage.cc
index 20a3e2fb..90383892 100644
--- a/src/HandshakeExtensionMessage.cc
+++ b/src/HandshakeExtensionMessage.cc
@@ -40,7 +40,7 @@
 #include "Logger.h"
 #include "message.h"
 #include "StringFormat.h"
-#include "bencode.h"
+#include "bencode2.h"
 #include "DownloadContext.h"
 #include "bittorrent_helper.h"
 #include "RequestGroup.h"
@@ -59,24 +59,24 @@ HandshakeExtensionMessage::~HandshakeExtensionMessage() {}
 
 std::string HandshakeExtensionMessage::getPayload()
 {
-  BDE dict = BDE::dict();
+  Dict dict;
   if(!_clientVersion.empty()) {
-    dict["v"] = _clientVersion;
+    dict.put("v", _clientVersion);
   }
   if(_tcpPort > 0) {
-    dict["p"] = _tcpPort;
+    dict.put("p", Integer::g(_tcpPort));
   }
-  BDE extDict = BDE::dict();
+  SharedHandle<Dict> extDict = Dict::g();
   for(std::map<std::string, uint8_t>::const_iterator itr = _extensions.begin(),
         eoi = _extensions.end(); itr != eoi; ++itr) {
     const std::map<std::string, uint8_t>::value_type& vt = *itr;
-    extDict[vt.first] = vt.second;
+    extDict->put(vt.first, Integer::g(vt.second));
   }
-  dict["m"] = extDict;
+  dict.put("m", extDict);
   if(_metadataSize) {
-    dict["metadata_size"] = _metadataSize;
+    dict.put("metadata_size", Integer::g(_metadataSize));
   }
-  return bencode::encode(dict);
+  return bencode2::encode(&dict);
 }
 
 std::string HandshakeExtensionMessage::toString() const
@@ -168,31 +168,34 @@ HandshakeExtensionMessage::create(const unsigned char* data, size_t length)
       ("Creating HandshakeExtensionMessage from %s",
        util::percentEncode(data, length).c_str());
   }
-  const BDE dict = bencode::decode(data+1, length-1);
-  if(!dict.isDict()) {
-    throw DL_ABORT_EX("Unexpected payload format for extended message handshake");
-  }
-  const BDE& port = dict["p"];
-  if(port.isInteger() && 0 < port.i() && port.i() < 65536) {
-    msg->_tcpPort = port.i();
-  }
-  const BDE& version = dict["v"];
-  if(version.isString()) {
-    msg->_clientVersion = version.s();
-  }
-  const BDE& extDict = dict["m"];
-  if(extDict.isDict()) {
-    for(BDE::Dict::const_iterator i = extDict.dictBegin(),
-          eoi = extDict.dictEnd(); i != eoi; ++i) {
-      if((*i).second.isInteger()) {
-        msg->_extensions[(*i).first] = (*i).second.i();
+  SharedHandle<ValueBase> decoded = bencode2::decode(data+1, length-1);
+  const Dict* dict = asDict(decoded);
+  if(!dict) {
+    throw DL_ABORT_EX
+      ("Unexpected payload format for extended message handshake");
+  }
+  const Integer* port = asInteger(dict->get("p"));
+  if(port && 0 < port->i() && port->i() < 65536) {
+    msg->_tcpPort = port->i();
+  }
+  const String* version = asString(dict->get("v"));
+  if(version) {
+    msg->_clientVersion = version->s();
+  }
+  const Dict* extDict = asDict(dict->get("m"));
+  if(extDict) {
+    for(Dict::ValueType::const_iterator i = extDict->begin(),
+          eoi = extDict->end(); i != eoi; ++i) {
+      const Integer* extId = asInteger((*i).second);
+      if(extId) {
+        msg->_extensions[(*i).first] = extId->i();
       }
     }
   }
-  const BDE& metadataSize = dict["metadata_size"];
+  const Integer* metadataSize = asInteger(dict->get("metadata_size"));
   // Only accept metadata smaller than 1MiB
-  if(metadataSize.isInteger() && metadataSize.i() <= 1024*1024) {
-    msg->_metadataSize = metadataSize.i();
+  if(metadataSize && metadataSize->i() <= 1024*1024) {
+    msg->_metadataSize = metadataSize->i();
   }
   return msg;
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index 485b604b..ad4835f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -194,7 +194,6 @@ SRCS =  Socket.h\
 	PieceSelector.h\
 	LongestSequencePieceSelector.cc LongestSequencePieceSelector.h\
 	bitfield.cc bitfield.h\
-	BDE.cc BDE.h\
 	CreateRequestCommand.cc CreateRequestCommand.h\
 	DownloadResultCode.h\
 	wallclock.h\
@@ -204,7 +203,6 @@ SRCS =  Socket.h\
 	Event.h\
 	timespec.h\
 	ValueBase.cc ValueBase.h\
-	bencode2.cc bencode2.h\
 	ContextAttribute.h\
 	TorrentAttribute.h
 
@@ -447,7 +445,6 @@ SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\
 	RangeBtMessageValidator.h\
 	IndexBtMessageValidator.h\
 	ExtensionMessageRegistry.h\
-	bencode.cc bencode.h\
 	bittorrent_helper.cc bittorrent_helper.h\
 	BtStopDownloadCommand.cc BtStopDownloadCommand.h\
 	PriorityPieceSelector.cc PriorityPieceSelector.h\
@@ -455,7 +452,8 @@ SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\
 	LpdMessageReceiver.cc LpdMessageReceiver.h\
 	LpdMessage.h\
 	LpdReceiveMessageCommand.cc LpdReceiveMessageCommand.h\
-	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h
+	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h\
+	bencode2.cc bencode2.h
 endif # ENABLE_BITTORRENT
 
 if ENABLE_METALINK
diff --git a/src/Makefile.in b/src/Makefile.in
index 8f5b23a3..a18465f9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -241,7 +241,6 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_BITTORRENT_TRUE@	RangeBtMessageValidator.h\
 @ENABLE_BITTORRENT_TRUE@	IndexBtMessageValidator.h\
 @ENABLE_BITTORRENT_TRUE@	ExtensionMessageRegistry.h\
-@ENABLE_BITTORRENT_TRUE@	bencode.cc bencode.h\
 @ENABLE_BITTORRENT_TRUE@	bittorrent_helper.cc bittorrent_helper.h\
 @ENABLE_BITTORRENT_TRUE@	BtStopDownloadCommand.cc BtStopDownloadCommand.h\
 @ENABLE_BITTORRENT_TRUE@	PriorityPieceSelector.cc PriorityPieceSelector.h\
@@ -249,7 +248,8 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_BITTORRENT_TRUE@	LpdMessageReceiver.cc LpdMessageReceiver.h\
 @ENABLE_BITTORRENT_TRUE@	LpdMessage.h\
 @ENABLE_BITTORRENT_TRUE@	LpdReceiveMessageCommand.cc LpdReceiveMessageCommand.h\
-@ENABLE_BITTORRENT_TRUE@	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h
+@ENABLE_BITTORRENT_TRUE@	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h\
+@ENABLE_BITTORRENT_TRUE@	bencode2.cc bencode2.h
 
 @ENABLE_METALINK_TRUE@am__append_14 = Metalinker.cc Metalinker.h\
 @ENABLE_METALINK_TRUE@	MetalinkEntry.cc MetalinkEntry.h\
@@ -433,13 +433,12 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	SelectEventPoll.cc SelectEventPoll.h SequentialPicker.h \
 	SequentialDispatcherCommand.h PieceSelector.h \
 	LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \
-	bitfield.cc bitfield.h BDE.cc BDE.h CreateRequestCommand.cc \
+	bitfield.cc bitfield.h CreateRequestCommand.cc \
 	CreateRequestCommand.h DownloadResultCode.h wallclock.h \
 	download_helper.cc download_helper.h MetadataInfo.cc \
 	MetadataInfo.h SessionSerializer.cc SessionSerializer.h \
-	Event.h timespec.h ValueBase.cc ValueBase.h bencode2.cc \
-	bencode2.h ContextAttribute.h TorrentAttribute.h \
-	XmlRpcRequestParserController.cc \
+	Event.h timespec.h ValueBase.cc ValueBase.h ContextAttribute.h \
+	TorrentAttribute.h XmlRpcRequestParserController.cc \
 	XmlRpcRequestParserController.h \
 	XmlRpcRequestParserStateMachine.cc \
 	XmlRpcRequestParserStateMachine.h XmlRpcRequestParserState.h \
@@ -586,25 +585,25 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	IndexBtMessage.cc IndexBtMessage.h ZeroBtMessage.cc \
 	ZeroBtMessage.h RangeBtMessageValidator.h \
 	IndexBtMessageValidator.h ExtensionMessageRegistry.h \
-	bencode.cc bencode.h bittorrent_helper.cc bittorrent_helper.h \
+	bittorrent_helper.cc bittorrent_helper.h \
 	BtStopDownloadCommand.cc BtStopDownloadCommand.h \
 	PriorityPieceSelector.cc PriorityPieceSelector.h \
 	LpdMessageDispatcher.cc LpdMessageDispatcher.h \
 	LpdMessageReceiver.cc LpdMessageReceiver.h LpdMessage.h \
 	LpdReceiveMessageCommand.cc LpdReceiveMessageCommand.h \
 	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h \
-	Metalinker.cc Metalinker.h MetalinkEntry.cc MetalinkEntry.h \
-	MetalinkResource.cc MetalinkResource.h MetalinkMetaurl.cc \
-	MetalinkMetaurl.h MetalinkProcessor.h \
-	MetalinkParserController.cc MetalinkParserController.h \
-	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h \
-	MetalinkParserState.h MetalinkParserStateImpl.cc \
-	MetalinkParserStateImpl.h MetalinkParserStateV3Impl.cc \
-	MetalinkParserStateV3Impl.h MetalinkParserStateV4Impl.cc \
-	MetalinkParserStateV4Impl.h Metalink2RequestGroup.cc \
-	Metalink2RequestGroup.h MetalinkPostDownloadHandler.cc \
-	MetalinkPostDownloadHandler.h MetalinkHelper.cc \
-	MetalinkHelper.h XML2SAXMetalinkProcessor.cc \
+	bencode2.cc bencode2.h Metalinker.cc Metalinker.h \
+	MetalinkEntry.cc MetalinkEntry.h MetalinkResource.cc \
+	MetalinkResource.h MetalinkMetaurl.cc MetalinkMetaurl.h \
+	MetalinkProcessor.h MetalinkParserController.cc \
+	MetalinkParserController.h MetalinkParserStateMachine.cc \
+	MetalinkParserStateMachine.h MetalinkParserState.h \
+	MetalinkParserStateImpl.cc MetalinkParserStateImpl.h \
+	MetalinkParserStateV3Impl.cc MetalinkParserStateV3Impl.h \
+	MetalinkParserStateV4Impl.cc MetalinkParserStateV4Impl.h \
+	Metalink2RequestGroup.cc Metalink2RequestGroup.h \
+	MetalinkPostDownloadHandler.cc MetalinkPostDownloadHandler.h \
+	MetalinkHelper.cc MetalinkHelper.h XML2SAXMetalinkProcessor.cc \
 	XML2SAXMetalinkProcessor.h ExpatMetalinkProcessor.cc \
 	ExpatMetalinkProcessor.h asctime_r.c asctime_r.h libgen.c \
 	libgen.h getaddrinfo.c getaddrinfo.h gai_strerror.c \
@@ -759,14 +758,14 @@ am__objects_6 =
 @ENABLE_BITTORRENT_TRUE@	RangeBtMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	IndexBtMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	ZeroBtMessage.$(OBJEXT) \
-@ENABLE_BITTORRENT_TRUE@	bencode.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	bittorrent_helper.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	BtStopDownloadCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	PriorityPieceSelector.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	LpdMessageDispatcher.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	LpdMessageReceiver.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	LpdReceiveMessageCommand.$(OBJEXT) \
-@ENABLE_BITTORRENT_TRUE@	LpdDispatchMessageCommand.$(OBJEXT)
+@ENABLE_BITTORRENT_TRUE@	LpdDispatchMessageCommand.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	bencode2.$(OBJEXT)
 @ENABLE_METALINK_TRUE@am__objects_14 = Metalinker.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkEntry.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkResource.$(OBJEXT) \
@@ -873,10 +872,9 @@ am__objects_32 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	SocketBuffer.$(OBJEXT) OptionHandlerException.$(OBJEXT) \
 	URIResult.$(OBJEXT) SelectEventPoll.$(OBJEXT) \
 	LongestSequencePieceSelector.$(OBJEXT) bitfield.$(OBJEXT) \
-	BDE.$(OBJEXT) CreateRequestCommand.$(OBJEXT) \
-	download_helper.$(OBJEXT) MetadataInfo.$(OBJEXT) \
-	SessionSerializer.$(OBJEXT) ValueBase.$(OBJEXT) \
-	bencode2.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
+	CreateRequestCommand.$(OBJEXT) download_helper.$(OBJEXT) \
+	MetadataInfo.$(OBJEXT) SessionSerializer.$(OBJEXT) \
+	ValueBase.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
 	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
@@ -1212,23 +1210,22 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	SelectEventPoll.cc SelectEventPoll.h SequentialPicker.h \
 	SequentialDispatcherCommand.h PieceSelector.h \
 	LongestSequencePieceSelector.cc LongestSequencePieceSelector.h \
-	bitfield.cc bitfield.h BDE.cc BDE.h CreateRequestCommand.cc \
+	bitfield.cc bitfield.h CreateRequestCommand.cc \
 	CreateRequestCommand.h DownloadResultCode.h wallclock.h \
 	download_helper.cc download_helper.h MetadataInfo.cc \
 	MetadataInfo.h SessionSerializer.cc SessionSerializer.h \
-	Event.h timespec.h ValueBase.cc ValueBase.h bencode2.cc \
-	bencode2.h ContextAttribute.h TorrentAttribute.h \
-	$(am__append_1) $(am__append_2) $(am__append_3) \
-	$(am__append_4) $(am__append_5) $(am__append_6) \
-	$(am__append_7) $(am__append_8) $(am__append_9) \
-	$(am__append_10) $(am__append_11) $(am__append_12) \
-	$(am__append_13) $(am__append_14) $(am__append_15) \
-	$(am__append_16) $(am__append_17) $(am__append_18) \
-	$(am__append_19) $(am__append_20) $(am__append_21) \
-	$(am__append_22) $(am__append_23) $(am__append_24) \
-	$(am__append_25) $(am__append_26) $(am__append_27) \
-	$(am__append_28) $(am__append_29) $(am__append_30) \
-	$(am__append_31)
+	Event.h timespec.h ValueBase.cc ValueBase.h ContextAttribute.h \
+	TorrentAttribute.h $(am__append_1) $(am__append_2) \
+	$(am__append_3) $(am__append_4) $(am__append_5) \
+	$(am__append_6) $(am__append_7) $(am__append_8) \
+	$(am__append_9) $(am__append_10) $(am__append_11) \
+	$(am__append_12) $(am__append_13) $(am__append_14) \
+	$(am__append_15) $(am__append_16) $(am__append_17) \
+	$(am__append_18) $(am__append_19) $(am__append_20) \
+	$(am__append_21) $(am__append_22) $(am__append_23) \
+	$(am__append_24) $(am__append_25) $(am__append_26) \
+	$(am__append_27) $(am__append_28) $(am__append_29) \
+	$(am__append_30) $(am__append_31)
 noinst_LIBRARIES = libaria2c.a
 libaria2c_a_SOURCES = $(SRCS)
 aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
@@ -1348,7 +1345,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuthConfig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuthConfigFactory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AutoSaveCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BDE.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BNode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Base64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BitfieldMan.Po@am__quote@
@@ -1631,7 +1627,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZeroBtMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asctime_r.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base32.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bencode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bencode2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitfield.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bittorrent_helper.Po@am__quote@
diff --git a/src/PeerListProcessor.h b/src/PeerListProcessor.h
index 6210fcf7..530778af 100644
--- a/src/PeerListProcessor.h
+++ b/src/PeerListProcessor.h
@@ -40,120 +40,76 @@
 #include <cstring>
 
 #include "a2netcompat.h"
-#include "bencode.h"
 #include "Peer.h"
 #include "ValueBase.h"
 
 namespace aria2 {
 
 class PeerListProcessor {
-private:
+public:
   template<typename OutputIterator>
-  class PeerListValueBaseVisitor:public ValueBaseVisitor {
-    OutputIterator dest_;
-  public:
-    PeerListValueBaseVisitor(OutputIterator dest):dest_(dest) {}
+  void extractPeer(const ValueBase* peerData, OutputIterator dest)
+  {
+    class PeerListValueBaseVisitor:public ValueBaseVisitor {
+    private:
+      OutputIterator dest_;
+    public:
+      PeerListValueBaseVisitor(OutputIterator dest):dest_(dest) {}
 
-    virtual void visit(const String& peerData)
-    {
-      size_t length = peerData.s().size();
-      if(length%6 == 0) {
-        const char* base = peerData.s().data();
-        for(size_t i = 0; i < length; i += 6) {
-          struct in_addr in;
-          memcpy(&in.s_addr, base+i, sizeof(uint32_t));
-          std::string ipaddr = inet_ntoa(in);
-          uint16_t port_nworder;
-          memcpy(&port_nworder, base+i+4, sizeof(uint16_t));
-          uint16_t port = ntohs(port_nworder);
-          *dest_ = SharedHandle<Peer>(new Peer(ipaddr, port));
-          ++dest_;
+      virtual ~PeerListValueBaseVisitor() {}
+
+      virtual void visit(const String& peerData)
+      {
+        size_t length = peerData.s().size();
+        if(length%6 == 0) {
+          const char* base = peerData.s().data();
+          for(size_t i = 0; i < length; i += 6) {
+            struct in_addr in;
+            memcpy(&in.s_addr, base+i, sizeof(uint32_t));
+            std::string ipaddr = inet_ntoa(in);
+            uint16_t port_nworder;
+            memcpy(&port_nworder, base+i+4, sizeof(uint16_t));
+            uint16_t port = ntohs(port_nworder);
+            *dest_ = SharedHandle<Peer>(new Peer(ipaddr, port));
+            ++dest_;
+          }
         }
       }
-    }
 
-    virtual void visit(const Integer& v) {}
+      virtual void visit(const Integer& v) {}
 
-    virtual void visit(const List& peerData)
-    {
-      for(List::ValueType::const_iterator itr = peerData.begin(),
-            eoi = peerData.end(); itr != eoi; ++itr) {
-        const Dict* peerDict = asDict(*itr);
-        if(!peerDict) {
-          continue;
-        }
-        static const std::string IP = "ip";
-        static const std::string PORT = "port";
-        const String* ip = asString(peerDict->get(IP));
-        const Integer* port = asInteger(peerDict->get(PORT));
-        if(!ip || !port || !(0 < port->i() && port->i() < 65536)) {
-          continue;
+      virtual void visit(const List& peerData)
+      {
+        for(List::ValueType::const_iterator itr = peerData.begin(),
+              eoi = peerData.end(); itr != eoi; ++itr) {
+          const Dict* peerDict = asDict(*itr);
+          if(!peerDict) {
+            continue;
+          }
+          static const std::string IP = "ip";
+          static const std::string PORT = "port";
+          const String* ip = asString(peerDict->get(IP));
+          const Integer* port = asInteger(peerDict->get(PORT));
+          if(!ip || !port || !(0 < port->i() && port->i() < 65536)) {
+            continue;
+          }
+          *dest_ = SharedHandle<Peer>(new Peer(ip->s(), port->i()));
+          ++dest_;
         }
-        *dest_ = SharedHandle<Peer>(new Peer(ip->s(), port->i()));
-        ++dest_;
       }
-    }
 
-    virtual void visit(const Dict& v) {}
-  };
-public:
-  template<typename OutputIterator>
-  void extractPeer(const SharedHandle<ValueBase>& peerData, OutputIterator dest)
-  {
-    if(!peerData.isNull()) {
-      PeerListValueBaseVisitor<OutputIterator> visitor(dest);
+      virtual void visit(const Dict& v) {}
+    };
+    if(peerData) {
+      PeerListValueBaseVisitor visitor(dest);
       peerData->accept(visitor);
     }
   }
 
   template<typename OutputIterator>
-  void extractPeer(const BDE& peerData, OutputIterator dest)
-  {
-    if(peerData.isList()) {
-      extractPeerFromList(peerData, dest);
-    } else if(peerData.isString()) {
-      extractPeerFromCompact(peerData, dest);
-    }
-  }
-
-  template<typename OutputIterator>
-  void extractPeerFromList(const BDE& peerData, OutputIterator dest)
-  {
-    for(BDE::List::const_iterator itr = peerData.listBegin(),
-          eoi = peerData.listEnd(); itr != eoi; ++itr) {
-      const BDE& peerDict = *itr;
-      if(!peerDict.isDict()) {
-        continue;
-      }
-      static const std::string IP = "ip";
-      static const std::string PORT = "port";
-      const BDE& ip = peerDict[IP];
-      const BDE& port = peerDict[PORT];
-      if(!ip.isString() || !port.isInteger() ||
-         !(0 < port.i() && port.i() < 65536)) {
-        continue;
-      }
-      *dest = SharedHandle<Peer>(new Peer(ip.s(), port.i()));
-      ++dest;
-    }
-  }
-
-  template<typename OutputIterator>
-  void extractPeerFromCompact(const BDE& peerData, OutputIterator dest)
+  void extractPeer(const SharedHandle<ValueBase>& peerData, OutputIterator dest)
   {
-    size_t length = peerData.s().size();
-    if(length%6 == 0) {
-      for(size_t i = 0; i < length; i += 6) {
-        struct in_addr in;
-        memcpy(&in.s_addr, peerData.s().c_str()+i, sizeof(uint32_t));
-        std::string ipaddr = inet_ntoa(in);
-        uint16_t port_nworder;
-        memcpy(&port_nworder, peerData.s().c_str()+i+4, sizeof(uint16_t));
-        uint16_t port = ntohs(port_nworder);
-        *dest = SharedHandle<Peer>(new Peer(ipaddr, port));
-        ++dest;
-      }
-    }
+    return extractPeer(peerData.get(), dest);
   }
 };
 
diff --git a/src/UTMetadataDataExtensionMessage.cc b/src/UTMetadataDataExtensionMessage.cc
index 2b97a1e2..a63855db 100644
--- a/src/UTMetadataDataExtensionMessage.cc
+++ b/src/UTMetadataDataExtensionMessage.cc
@@ -33,8 +33,7 @@
  */
 /* copyright --> */
 #include "UTMetadataDataExtensionMessage.h"
-#include "BDE.h"
-#include "bencode.h"
+#include "bencode2.h"
 #include "util.h"
 #include "a2functional.h"
 #include "DownloadContext.h"
@@ -55,11 +54,11 @@ UTMetadataDataExtensionMessage::UTMetadataDataExtensionMessage
 
 std::string UTMetadataDataExtensionMessage::getPayload()
 {
-  BDE dict = BDE::dict();
-  dict["msg_type"] = 1;
-  dict["piece"] = getIndex();
-  dict["total_size"] = _totalSize;
-  return bencode::encode(dict)+_data;
+  Dict dict;
+  dict.put("msg_type", Integer::g(1));
+  dict.put("piece", Integer::g(getIndex()));
+  dict.put("total_size", Integer::g(_totalSize));
+  return bencode2::encode(&dict)+_data;
 }
 
 std::string UTMetadataDataExtensionMessage::toString() const
diff --git a/src/UTMetadataPostDownloadHandler.cc b/src/UTMetadataPostDownloadHandler.cc
index 5127fd57..44e7073f 100644
--- a/src/UTMetadataPostDownloadHandler.cc
+++ b/src/UTMetadataPostDownloadHandler.cc
@@ -33,7 +33,6 @@
  */
 /* copyright --> */
 #include "UTMetadataPostDownloadHandler.h"
-#include "BDE.h"
 #include "bittorrent_helper.h"
 #include "RequestGroup.h"
 #include "download_helper.h"
@@ -46,7 +45,7 @@
 #include "a2functional.h"
 #include "DiskAdaptor.h"
 #include "PieceStorage.h"
-#include "bencode.h"
+#include "bencode2.h"
 #include "message.h"
 #include "prefs.h"
 #include "Option.h"
diff --git a/src/UTMetadataRejectExtensionMessage.cc b/src/UTMetadataRejectExtensionMessage.cc
index 53cadb9b..4221b794 100644
--- a/src/UTMetadataRejectExtensionMessage.cc
+++ b/src/UTMetadataRejectExtensionMessage.cc
@@ -33,10 +33,9 @@
  */
 /* copyright --> */
 #include "UTMetadataRejectExtensionMessage.h"
-#include "BDE.h"
 #include "a2functional.h"
 #include "util.h"
-#include "bencode.h"
+#include "bencode2.h"
 #include "DlAbortEx.h"
 
 namespace aria2 {
@@ -47,10 +46,10 @@ UTMetadataRejectExtensionMessage::UTMetadataRejectExtensionMessage
 
 std::string UTMetadataRejectExtensionMessage::getPayload()
 {
-  BDE dict = BDE::dict();
-  dict["msg_type"] = 2;
-  dict["piece"] = getIndex();
-  return bencode::encode(dict);
+  Dict dict;
+  dict.put("msg_type", Integer::g(2));
+  dict.put("piece", Integer::g(getIndex()));
+  return bencode2::encode(&dict);
 }
 
 std::string UTMetadataRejectExtensionMessage::toString() const
diff --git a/src/UTMetadataRequestExtensionMessage.cc b/src/UTMetadataRequestExtensionMessage.cc
index 3bbaf4ac..8372fb10 100644
--- a/src/UTMetadataRequestExtensionMessage.cc
+++ b/src/UTMetadataRequestExtensionMessage.cc
@@ -33,8 +33,7 @@
  */
 /* copyright --> */
 #include "UTMetadataRequestExtensionMessage.h"
-#include "BDE.h"
-#include "bencode.h"
+#include "bencode2.h"
 #include "util.h"
 #include "a2functional.h"
 #include "bittorrent_helper.h"
@@ -57,10 +56,10 @@ UTMetadataRequestExtensionMessage::UTMetadataRequestExtensionMessage
 
 std::string UTMetadataRequestExtensionMessage::getPayload()
 {
-  BDE dict = BDE::dict();
-  dict["msg_type"] = 0;
-  dict["piece"] = getIndex();
-  return bencode::encode(dict);
+  Dict dict;
+  dict.put("msg_type", Integer::g(0));
+  dict.put("piece", Integer::g(getIndex()));
+  return bencode2::encode(&dict);
 }
 
 std::string UTMetadataRequestExtensionMessage::toString() const
diff --git a/src/UTPexExtensionMessage.cc b/src/UTPexExtensionMessage.cc
index f3d0fdb9..d31621a9 100644
--- a/src/UTPexExtensionMessage.cc
+++ b/src/UTPexExtensionMessage.cc
@@ -41,7 +41,7 @@
 #include "DlAbortEx.h"
 #include "message.h"
 #include "StringFormat.h"
-#include "bencode.h"
+#include "bencode2.h"
 #include "a2functional.h"
 #include "wallclock.h"
 
@@ -64,11 +64,11 @@ std::string UTPexExtensionMessage::getPayload()
   std::pair<std::string, std::string> droppedPeerPair =
     createCompactPeerListAndFlag(_droppedPeers);
 
-  BDE dict = BDE::dict();
-  dict["added"] = freshPeerPair.first;
-  dict["added.f"] = freshPeerPair.second;
-  dict["dropped"] = droppedPeerPair.first;
-  return bencode::encode(dict);
+  Dict dict;
+  dict.put("added", freshPeerPair.first);
+  dict.put("added.f", freshPeerPair.second);
+  dict.put("dropped", droppedPeerPair.first);
+  return bencode2::encode(&dict);
 }
 
 std::pair<std::string, std::string>
@@ -158,17 +158,17 @@ UTPexExtensionMessage::create(const unsigned char* data, size_t len)
   }
   UTPexExtensionMessageHandle msg(new UTPexExtensionMessage(*data));
 
-  const BDE dict = bencode::decode(data+1, len-1);
-  if(dict.isDict()) {
+  SharedHandle<ValueBase> decoded = bencode2::decode(data+1, len-1);
+  const Dict* dict = asDict(decoded);
+  if(dict) {
     PeerListProcessor proc;
-    const BDE& added = dict["added"];
-    if(added.isString()) {
-      proc.extractPeerFromCompact(added, std::back_inserter(msg->_freshPeers));
+    const String* added = asString(dict->get("added"));
+    if(added) {
+      proc.extractPeer(added, std::back_inserter(msg->_freshPeers));
     }
-    const BDE& dropped = dict["dropped"];
-    if(dropped.isString()) {
-      proc.extractPeerFromCompact(dropped,
-                                  std::back_inserter(msg->_droppedPeers));
+    const String* dropped = asString(dict->get("dropped"));
+    if(dropped) {
+      proc.extractPeer(dropped, std::back_inserter(msg->_droppedPeers));
     }
   }
   return msg;
diff --git a/src/ValueBase.cc b/src/ValueBase.cc
index 1e318f01..ddc11f51 100644
--- a/src/ValueBase.cc
+++ b/src/ValueBase.cc
@@ -64,6 +64,11 @@ SharedHandle<String> String::g(const ValueType& string)
   return SharedHandle<String>(new String(string));
 }
 
+SharedHandle<String> String::g(const unsigned char* data, size_t length)
+{
+  return SharedHandle<String>(new String(data, length));
+}
+
 void String::accept(ValueBaseVisitor& v) const
 {
   v.visit(*this);
@@ -95,11 +100,21 @@ const SharedHandle<ValueBase>& List::get(size_t index) const
   return list_[index];
 }
 
+void List::set(size_t index, const SharedHandle<ValueBase>& v)
+{
+  list_[index] = v;
+}
+
 void List::append(const SharedHandle<ValueBase>& v)
 {
   list_.push_back(v);
 }
 
+void List::append(const String::ValueType& string)
+{
+  list_.push_back(String::g(string));
+}
+
 List& List::operator<<(const SharedHandle<ValueBase>& v)
 {
   list_.push_back(v);
diff --git a/src/ValueBase.h b/src/ValueBase.h
index 9dbbcf51..3f907923 100644
--- a/src/ValueBase.h
+++ b/src/ValueBase.h
@@ -96,6 +96,8 @@ public:
 
   static SharedHandle<String> g(const ValueType& string);
 
+  static SharedHandle<String> g(const unsigned char* data, size_t length);
+
   virtual void accept(ValueBaseVisitor& visitor) const;
 private:
   ValueType str_;
@@ -128,12 +130,18 @@ public:
   // Appends given v to list.
   void append(const SharedHandle<ValueBase>& v);
 
+  // Appeding string is so common that we provide shortcut function.
+  void append(const String::ValueType& string);
+
   // Alias for append()
   List& operator<<(const SharedHandle<ValueBase>& v);
 
   // Returns the object at given index.
   const SharedHandle<ValueBase>& get(size_t index) const;
 
+  // Set the object at given index.
+  void set(size_t index, const SharedHandle<ValueBase>& v);
+
   // Returns the const reference of the object at the given index.
   const SharedHandle<ValueBase>& operator[](size_t index) const;
 
diff --git a/src/Xml2XmlRpcRequestProcessor.cc b/src/Xml2XmlRpcRequestProcessor.cc
index c30998bb..0de3a1af 100644
--- a/src/Xml2XmlRpcRequestProcessor.cc
+++ b/src/Xml2XmlRpcRequestProcessor.cc
@@ -145,7 +145,11 @@ XmlRpcRequestProcessor::parseMemory(const std::string& xml)
   if(r != 0) {
     throw DL_ABORT_EX(MSG_CANNOT_PARSE_XML_RPC_REQUEST);
   }
-  return XmlRpcRequest(_stm->getMethodName(), _stm->getCurrentFrameValue());
+  if(!asList(_stm->getCurrentFrameValue())) {
+    throw DL_ABORT_EX("Bad XML-RPC parameter list");
+  }
+  return XmlRpcRequest(_stm->getMethodName(),
+                       static_pointer_cast<List>(_stm->getCurrentFrameValue()));
 }
 
 } // namespace xmlrpc
diff --git a/src/XmlRpcMethod.cc b/src/XmlRpcMethod.cc
index 726d5181..351dc836 100644
--- a/src/XmlRpcMethod.cc
+++ b/src/XmlRpcMethod.cc
@@ -34,7 +34,6 @@
 /* copyright --> */
 #include "XmlRpcMethod.h"
 #include "DownloadEngine.h"
-#include "BDE.h"
 #include "LogFactory.h"
 #include "RecoverableException.h"
 #include "message.h"
@@ -52,6 +51,7 @@
 #include "CheckIntegrityEntry.h"
 #include "ServerStatMan.h"
 #include "FileEntry.h"
+#include "DlAbortEx.h"
 
 namespace aria2 {
 
@@ -61,11 +61,12 @@ XmlRpcMethod::XmlRpcMethod():
   _optionParser(OptionParser::getInstance()),
   _logger(LogFactory::getInstance()) {}
 
-BDE XmlRpcMethod::createErrorResponse(const Exception& e)
+SharedHandle<ValueBase> XmlRpcMethod::createErrorResponse
+(const Exception& e)
 {
-  BDE params = BDE::dict();
-  params["faultCode"] = BDE(1);
-  params["faultString"] = BDE(e.what());
+  SharedHandle<Dict> params = Dict::g();
+  params->put("faultCode", Integer::g(1));
+  params->put("faultString", std::string(e.what()));
   return params;
 }
 
@@ -105,29 +106,35 @@ static void gatherOption
            ("We don't know how to deal with %s option",
             optionName.c_str()).str());
       }
-      // header and index-out option can take array as value
-      const BDE& value = (*first).second;
-      if((optionName == PREF_HEADER || optionName == PREF_INDEX_OUT) &&
-         value.isList()){
-        for(BDE::List::const_iterator argiter = value.listBegin(),
-              eoi = value.listEnd(); argiter != eoi; ++argiter) {
-          if((*argiter).isString()) {
-            optionHandler->parse(*option.get(), (*argiter).s());
+      const String* opval = asString((*first).second);
+      if(opval) {
+        optionHandler->parse(*option.get(), opval->s());
+      } else {
+        // header and index-out option can take array as value
+        const List* oplist = asList((*first).second);
+        if(oplist &&
+           (optionName == PREF_HEADER || optionName == PREF_INDEX_OUT)) {
+          for(List::ValueType::const_iterator argiter = oplist->begin(),
+                eoi = oplist->end(); argiter != eoi; ++argiter) {
+            const String* opval = asString(*argiter);
+            if(opval) {
+              optionHandler->parse(*option.get(), opval->s());
+            }
           }
         }
-      } else if(value.isString()) {
-        optionHandler->parse(*option.get(), value.s());
       }
     }
   }  
 }
 
 void XmlRpcMethod::gatherRequestOption
-(const SharedHandle<Option>& option, const BDE& optionsDict)
+(const SharedHandle<Option>& option, const Dict* optionsDict)
 {
-  gatherOption(optionsDict.dictBegin(), optionsDict.dictEnd(),
-               listRequestOptions(),
-               option, _optionParser);
+  if(optionsDict) {
+    gatherOption(optionsDict->begin(), optionsDict->end(),
+                 listRequestOptions(),
+                 option, _optionParser);
+  }
 }
 
 // Copy option in the range [optNameFirst, optNameLast) from src to
@@ -158,11 +165,13 @@ const std::set<std::string>& listChangeableOptions()
 }
 
 void XmlRpcMethod::gatherChangeableOption
-(const SharedHandle<Option>& option, const BDE& optionsDict)
+(const SharedHandle<Option>& option, const Dict* optionsDict)
 {
-  gatherOption(optionsDict.dictBegin(), optionsDict.dictEnd(),
-               listChangeableOptions(),
-               option, _optionParser);
+  if(optionsDict) {
+    gatherOption(optionsDict->begin(), optionsDict->end(),
+                 listChangeableOptions(),
+                 option, _optionParser);
+  }
 }
 
 void XmlRpcMethod::applyChangeableOption(Option* dest, Option* src) const
@@ -183,11 +192,13 @@ const std::set<std::string>& listChangeableGlobalOptions()
 }
 
 void XmlRpcMethod::gatherChangeableGlobalOption
-(const SharedHandle<Option>& option, const BDE& optionsDict)
+(const SharedHandle<Option>& option, const Dict* optionsDict)
 {
-  gatherOption(optionsDict.dictBegin(), optionsDict.dictEnd(),
-               listChangeableGlobalOptions(),
-               option, _optionParser);
+  if(optionsDict) {
+    gatherOption(optionsDict->begin(), optionsDict->end(),
+                 listChangeableGlobalOptions(),
+                 option, _optionParser);
+  }
 }
 
 void XmlRpcMethod::applyChangeableGlobalOption(Option* dest, Option* src) const
diff --git a/src/XmlRpcMethod.h b/src/XmlRpcMethod.h
index 045b2e41..e4c96297 100644
--- a/src/XmlRpcMethod.h
+++ b/src/XmlRpcMethod.h
@@ -40,12 +40,12 @@
 #include <string>
 
 #include "SharedHandle.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
 class DownloadEngine;
 class OptionParser;
-class BDE;
 class Logger;
 class Option;
 class Exception;
@@ -71,26 +71,27 @@ protected:
   // Subclass must implement this function to fulfil XmlRpcRequest
   // req.  The return value of this method is used as a return value
   // of XML-RPC request.
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e) = 0;
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e) = 0;
 
-  void gatherRequestOption(const SharedHandle<Option>& option,
-                           const BDE& optionsDict);
+  void gatherRequestOption
+  (const SharedHandle<Option>& option, const Dict* optionsDict);
 
-  void gatherChangeableOption(const SharedHandle<Option>& option,
-                              const BDE& optionDict);
+  void gatherChangeableOption
+  (const SharedHandle<Option>& option, const Dict* optionDict);
 
   // Copy options which is changeable in XML-RPC changeOption command
   // to dest.
   void applyChangeableOption(Option* dest, Option* src) const;
 
   void gatherChangeableGlobalOption(const SharedHandle<Option>& option,
-                                    const BDE& optionDict);
+                                    const Dict* optionDict);
 
   // Copy options which is changeable in XML-RPC changeGlobalOption
   // command to dest.
   void applyChangeableGlobalOption(Option* dest, Option* src) const;
 
-  BDE createErrorResponse(const Exception& e);
+  SharedHandle<ValueBase> createErrorResponse(const Exception& e);
 
   const SharedHandle<OptionParser>& getOptionParser() const
   {
diff --git a/src/XmlRpcMethodImpl.cc b/src/XmlRpcMethodImpl.cc
index f1db44e4..e169e639 100644
--- a/src/XmlRpcMethodImpl.cc
+++ b/src/XmlRpcMethodImpl.cc
@@ -39,7 +39,6 @@
 
 #include "Logger.h"
 #include "LogFactory.h"
-#include "BDE.h"
 #include "DlAbortEx.h"
 #include "Option.h"
 #include "OptionParser.h"
@@ -82,17 +81,17 @@ namespace aria2 {
 namespace xmlrpc {
 
 namespace {
-const BDE BDE_TRUE = BDE("true");
-const BDE BDE_FALSE = BDE("false");
-const BDE BDE_OK = BDE("OK");
-const BDE BDE_ACTIVE = BDE("active");
-const BDE BDE_WAITING = BDE("waiting");
-const BDE BDE_PAUSED = BDE("paused");
-const BDE BDE_REMOVED = BDE("removed");
-const BDE BDE_ERROR = BDE("error");
-const BDE BDE_COMPLETE = BDE("complete");
-const BDE BDE_USED = BDE("used");
-const BDE BDE_ZERO = BDE("0");
+const SharedHandle<String> VLB_TRUE = String::g("true");
+const SharedHandle<String> VLB_FALSE = String::g("false");
+const SharedHandle<String> VLB_OK = String::g("OK");
+const SharedHandle<String> VLB_ACTIVE = String::g("active");
+const SharedHandle<String> VLB_WAITING = String::g("waiting");
+const SharedHandle<String> VLB_PAUSED = String::g("paused");
+const SharedHandle<String> VLB_REMOVED = String::g("removed");
+const SharedHandle<String> VLB_ERROR = String::g("error");
+const SharedHandle<String> VLB_COMPLETE = String::g("complete");
+const SharedHandle<String> VLB_USED = String::g("used");
+const SharedHandle<String> VLB_ZERO = String::g("0");
 
 const std::string KEY_GID = "gid";
 const std::string KEY_ERROR_CODE = "errorCode";
@@ -140,14 +139,15 @@ const std::string KEY_MODE = "mode";
 const std::string KEY_SERVERS = "servers";
 }
 
-static BDE createGIDResponse(gid_t gid)
+static SharedHandle<ValueBase> createGIDResponse(gid_t gid)
 {
-  return BDE(util::itos(gid));
+  return String::g(util::itos(gid));
 }
 
-static BDE addRequestGroup(const SharedHandle<RequestGroup>& group,
-                           DownloadEngine* e,
-                           bool posGiven, int pos)
+static SharedHandle<ValueBase>
+addRequestGroup(const SharedHandle<RequestGroup>& group,
+                DownloadEngine* e,
+                bool posGiven, int pos)
 {
   if(posGiven) {
     e->getRequestGroupMan()->insertReservedGroup(pos, group);
@@ -168,51 +168,100 @@ findRequestGroup(const SharedHandle<RequestGroupMan>& rgman, gid_t gid)
   return group;
 }
 
-static bool hasDictParam(const BDE& params, size_t index)
+static const String* getStringParam
+(const SharedHandle<List>& params, size_t index)
 {
-  return params.size() > index && params[index].isDict();
+  const String* stringParam = 0;
+  if(params->size() > index) {
+    stringParam = asString(params->get(index));
+  }
+  return stringParam;
+}
+
+static const Integer* getIntegerParam
+(const SharedHandle<List>& params, size_t index)
+{
+  const Integer* integerParam = 0;
+  if(params->size() > index) {
+    integerParam = asInteger(params->get(index));
+  }
+  return integerParam;
+}
+
+static const List* getListParam(const SharedHandle<List>& params, size_t index)
+{
+  const List* listParam = 0;
+  if(params->size() > index) {
+    listParam = asList(params->get(index));
+  }
+  return listParam;
 }
 
-static void getPosParam(const BDE& params, size_t posParamIndex,
+static const Dict* getDictParam(const SharedHandle<List>& params, size_t index)
+{
+  const Dict* dictParam = 0;
+  if(params->size() > index) {
+    dictParam = asDict(params->get(index));
+  }
+  return dictParam;
+}
+
+static void getPosParam(const SharedHandle<List>& params, size_t posParamIndex,
                         bool& posGiven, size_t& pos)
 {
-  if(params.size() > posParamIndex && params[posParamIndex].isInteger()) {
-    if(params[posParamIndex].i() >= 0) {
-      pos = params[posParamIndex].i();
-      posGiven = true;
-    } else {
-      throw DL_ABORT_EX("Position must be greater than or equal to 0.");
+  if(params->size() > posParamIndex) {
+    const Integer* p = asInteger(params->get(posParamIndex));
+    if(p) {
+      if(p->i() >= 0) {
+        pos = p->i();
+        posGiven = true;
+        return;
+      } else {
+        throw DL_ABORT_EX("Position must be greater than or equal to 0.");
+      }
     }
-  } else {
-    posGiven = false;
   }
+  posGiven = false;
 } 
 
+static gid_t getRequiredGidParam
+(const SharedHandle<List>& params, size_t posParamIndex)
+{
+  const String* gidParam = getStringParam(params, posParamIndex);
+  if(gidParam) {
+    return util::parseLLInt(gidParam->s());
+  } else {
+    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
+  }
+}
+
 template<typename OutputIterator>
-static void extractUris(OutputIterator out, const BDE& src)
+static void extractUris(OutputIterator out, const List* src)
 {
-  for(BDE::List::const_iterator i = src.listBegin(), eoi = src.listEnd();
-      i != eoi; ++i) {
-    if((*i).isString()) {
-      out++ = (*i).s();
+  if(src) {
+    for(List::ValueType::const_iterator i = src->begin(), eoi = src->end();
+        i != eoi; ++i) {
+      const String* uri = asString(*i);
+      if(uri) {
+        out++ = uri->s();
+      }
     }
   }
 }
 
-BDE AddUriXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> AddUriXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isList() || params[0].empty()) {
+  const SharedHandle<List>& params = req.params;
+  std::vector<std::string> uris;
+  extractUris(std::back_inserter(uris), getListParam(params, 0));
+  if(uris.empty()) {
     throw DL_ABORT_EX("URI is not provided.");
   }
-  std::vector<std::string> uris;
-  extractUris(std::back_inserter(uris), params[0]);
 
   SharedHandle<Option> requestOption(new Option(*e->getOption()));
-  if(hasDictParam(params, 1)) {
-    gatherRequestOption(requestOption, params[1]);
-  }
+  gatherRequestOption(requestOption, getDictParam(params, 1));
+
   size_t pos = 0;
   bool posGiven = false;
   getPosParam(params, 2, posGiven, pos);
@@ -230,31 +279,28 @@ BDE AddUriXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
 }
 
 #ifdef ENABLE_BITTORRENT
-BDE AddTorrentXmlRpcMethod::process
+SharedHandle<ValueBase> AddTorrentXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isString()) {
+  const SharedHandle<List>& params = req.params;
+  const String* torrentParam = getStringParam(params, 0);
+  if(!torrentParam) {
     throw DL_ABORT_EX("Torrent data is not provided.");
   }
   
   std::vector<std::string> uris;
-  if(params.size() > 1 && params[1].isList()) {
-    extractUris(std::back_inserter(uris), params[1]);
-  }
+  extractUris(std::back_inserter(uris), getListParam(params, 1));
+
   SharedHandle<Option> requestOption(new Option(*e->getOption()));
-  if(hasDictParam(params, 2)) {
-    gatherRequestOption(requestOption, params[2]);
-  }
+  gatherRequestOption(requestOption, getDictParam(params, 2));
+
   size_t pos = 0;
   bool posGiven = false;
   getPosParam(params, 3, posGiven, pos);
 
   std::vector<SharedHandle<RequestGroup> > result;
   createRequestGroupForBitTorrent(result, requestOption,
-                                  uris,
-                                  params[0].s());
+                                  uris, torrentParam->s());
 
   if(!result.empty()) {
     return addRequestGroup(result.front(), e, posGiven, pos);
@@ -265,58 +311,48 @@ BDE AddTorrentXmlRpcMethod::process
 #endif // ENABLE_BITTORRENT
 
 #ifdef ENABLE_METALINK
-BDE AddMetalinkXmlRpcMethod::process
+SharedHandle<ValueBase> AddMetalinkXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isString()) {
+  const SharedHandle<List>& params = req.params;
+  const String* metalinkParam = getStringParam(params, 0);
+  if(!metalinkParam) {
     throw DL_ABORT_EX("Metalink data is not provided.");
   }
   
   SharedHandle<Option> requestOption(new Option(*e->getOption()));
-  if(hasDictParam(params, 1)) {
-    gatherRequestOption(requestOption, params[1]);
-  };
+  gatherRequestOption(requestOption, getDictParam(params, 1));
+
   size_t pos = 0;
   bool posGiven = false;
   getPosParam(params, 2, posGiven, pos);
 
   std::vector<SharedHandle<RequestGroup> > result;
-  createRequestGroupForMetalink(result, requestOption, params[0].s());
+  createRequestGroupForMetalink(result, requestOption, metalinkParam->s());
+  SharedHandle<List> gids = List::g();
   if(!result.empty()) {
     if(posGiven) {
       e->getRequestGroupMan()->insertReservedGroup(pos, result);
     } else {
       e->getRequestGroupMan()->addReservedGroup(result);
     }
-    BDE gids = BDE::list();
     for(std::vector<SharedHandle<RequestGroup> >::const_iterator i =
           result.begin(), eoi = result.end(); i != eoi; ++i) {
-      gids << BDE(util::itos((*i)->getGID()));
+      gids->append(util::itos((*i)->getGID()));
     }
-    return gids;
-  } else {
-    throw DL_ABORT_EX("No files to download.");
   }
+  return gids;
 } 
 #endif // ENABLE_METALINK
 
-static BDE removeDownload
+static SharedHandle<ValueBase> removeDownload
 (const XmlRpcRequest& req, DownloadEngine* e, bool forceRemove)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }
-  
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
 
   SharedHandle<RequestGroup> group =
     e->getRequestGroupMan()->findRequestGroup(gid);
-
   if(group.isNull()) {
     group = e->getRequestGroupMan()->findReservedGroup(gid);
     if(group.isNull()) {
@@ -338,17 +374,16 @@ static BDE removeDownload
       group->setHaltRequested(true, RequestGroup::USER_REQUEST);
     }
   }
-
   return createGIDResponse(gid);
-
 }
 
-BDE RemoveXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> RemoveXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
   return removeDownload(req, e, false);
 }
 
-BDE ForceRemoveXmlRpcMethod::process
+SharedHandle<ValueBase> ForceRemoveXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
   return removeDownload(req, e, true);
@@ -378,15 +413,12 @@ static bool pauseRequestGroup
   }
 }
 
-static BDE pauseDownload
+static SharedHandle<ValueBase> pauseDownload
 (const XmlRpcRequest& req, DownloadEngine* e, bool forcePause)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
+
   bool reserved = false;
   SharedHandle<RequestGroup> group =
     e->getRequestGroupMan()->findRequestGroup(gid);
@@ -403,12 +435,14 @@ static BDE pauseDownload
   }
 }
 
-BDE PauseXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> PauseXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
   return pauseDownload(req, e, false);
 }
 
-BDE ForcePauseXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> ForcePauseXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
   return pauseDownload(req, e, true);
 }
@@ -422,7 +456,7 @@ static void pauseRequestGroups
   }
 }
 
-static BDE pauseAllDownloads
+static SharedHandle<ValueBase> pauseAllDownloads
 (const XmlRpcRequest& req, DownloadEngine* e, bool forcePause)
 {
   const std::deque<SharedHandle<RequestGroup> >& groups =
@@ -432,28 +466,26 @@ static BDE pauseAllDownloads
     e->getRequestGroupMan()->getReservedGroups();
   pauseRequestGroups(reservedGroups.begin(), reservedGroups.end(),
                      true, forcePause);
-  return BDE_OK;
+  return VLB_OK;
 }
 
-BDE PauseAllXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> PauseAllXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
   return pauseAllDownloads(req, e, false);
 }
 
-BDE ForcePauseAllXmlRpcMethod::process
+SharedHandle<ValueBase> ForcePauseAllXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
   return pauseAllDownloads(req, e, true);
 }
 
-BDE UnpauseXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> UnpauseXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
   SharedHandle<RequestGroup> group =
     e->getRequestGroupMan()->findReservedGroup(gid);
   if(group.isNull() || !group->isPauseRequested()) {
@@ -467,7 +499,8 @@ BDE UnpauseXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
   return createGIDResponse(gid);
 }
 
-BDE UnpauseAllXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> UnpauseAllXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
   const std::deque<SharedHandle<RequestGroup> >& groups =
     e->getRequestGroupMan()->getReservedGroups();
@@ -475,177 +508,183 @@ BDE UnpauseAllXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
                 std::bind2nd(mem_fun_sh(&RequestGroup::setPauseRequested),
                              false));
   e->getRequestGroupMan()->requestQueueCheck();    
-  return BDE_OK;
+  return VLB_OK;
 }
 
-static void createUriEntry(BDE& uriList, const SharedHandle<FileEntry>& file)
+template<typename InputIterator>
+static void createUriEntry
+(const SharedHandle<List>& uriList,
+ InputIterator first, InputIterator last,
+ const SharedHandle<String>& status)
 {
-  {
-    const std::deque<std::string>& uris = file->getSpentUris();
-    for(std::deque<std::string>::const_iterator i = uris.begin(),
-          eoi = uris.end(); i != eoi; ++i) {
-      BDE entry = BDE::dict();
-      entry[KEY_URI] = *i;
-      entry[KEY_STATUS] = BDE_USED;
-      uriList << entry;
-    }
-  }
-  {
-    const std::deque<std::string>& uris = file->getRemainingUris();
-    for(std::deque<std::string>::const_iterator i = uris.begin(),
-          eoi = uris.end(); i != eoi; ++i) {
-      BDE entry = BDE::dict();
-      entry[KEY_URI] = *i;
-      entry[KEY_STATUS] = BDE_WAITING;
-      uriList << entry;
-    }
+  for(; first != last; ++first) {
+    SharedHandle<Dict> entry = Dict::g();
+    entry->put(KEY_URI, *first);
+    entry->put(KEY_STATUS, status);
+    uriList->append(entry);
   }
 }
 
+static void createUriEntry
+(const SharedHandle<List>& uriList, const SharedHandle<FileEntry>& file)
+{
+  createUriEntry(uriList,
+                 file->getSpentUris().begin(),
+                 file->getSpentUris().end(),
+                 VLB_USED);
+  createUriEntry(uriList,
+                 file->getRemainingUris().begin(),
+                 file->getRemainingUris().end(),
+                 VLB_WAITING);
+}
+
 template<typename InputIterator>
-static void createFileEntry(BDE& files, InputIterator first, InputIterator last)
+static void createFileEntry
+(const SharedHandle<List>& files, InputIterator first, InputIterator last)
 {
   size_t index = 1;
   for(; first != last; ++first, ++index) {
-    BDE entry = BDE::dict();
-    entry[KEY_INDEX] = util::uitos(index);
-    entry[KEY_PATH] = (*first)->getPath();
-    entry[KEY_SELECTED] = (*first)->isRequested()?BDE_TRUE:BDE_FALSE;
-    entry[KEY_LENGTH] = util::uitos((*first)->getLength());
+    SharedHandle<Dict> entry = Dict::g();
+    entry->put(KEY_INDEX, util::uitos(index));
+    entry->put(KEY_PATH, (*first)->getPath());
+    entry->put(KEY_SELECTED, (*first)->isRequested()?VLB_TRUE:VLB_FALSE);
+    entry->put(KEY_LENGTH, util::uitos((*first)->getLength()));
 
-    BDE uriList = BDE::list();
+    SharedHandle<List> uriList = List::g();
     createUriEntry(uriList, *first);
-    entry[KEY_URIS] = uriList;
-    files << entry;
+    entry->put(KEY_URIS, uriList);
+    files->append(entry);
   }
 }
 
 void gatherProgressCommon
-(BDE& entryDict, const SharedHandle<RequestGroup>& group)
+(const SharedHandle<Dict>& entryDict, const SharedHandle<RequestGroup>& group)
 {
-  entryDict[KEY_GID] = util::itos(group->getGID());
+  entryDict->put(KEY_GID, util::itos(group->getGID()));
   // This is "filtered" total length if --select-file is used.
-  entryDict[KEY_TOTAL_LENGTH] = util::uitos(group->getTotalLength());
+  entryDict->put(KEY_TOTAL_LENGTH, util::uitos(group->getTotalLength()));
   // This is "filtered" total length if --select-file is used.
-  entryDict[KEY_COMPLETED_LENGTH] = util::uitos(group->getCompletedLength());
+  entryDict->put(KEY_COMPLETED_LENGTH,util::uitos(group->getCompletedLength()));
   TransferStat stat = group->calculateStat();
-  entryDict[KEY_DOWNLOAD_SPEED] = util::uitos(stat.getDownloadSpeed());
-  entryDict[KEY_UPLOAD_SPEED] = util::uitos(stat.getUploadSpeed());
-  entryDict[KEY_UPLOAD_LENGTH] = util::uitos(stat.getAllTimeUploadLength());
-  entryDict[KEY_CONNECTIONS] = util::uitos(group->getNumConnection());
+  entryDict->put(KEY_DOWNLOAD_SPEED, util::uitos(stat.getDownloadSpeed()));
+  entryDict->put(KEY_UPLOAD_SPEED, util::uitos(stat.getUploadSpeed()));
+  entryDict->put(KEY_UPLOAD_LENGTH, util::uitos(stat.getAllTimeUploadLength()));
+  entryDict->put(KEY_CONNECTIONS, util::uitos(group->getNumConnection()));
   SharedHandle<PieceStorage> ps = group->getPieceStorage();
   if(!ps.isNull()) {
     if(ps->getBitfieldLength() > 0) {
-      entryDict[KEY_BITFIELD] = util::toHex(ps->getBitfield(),
-                                            ps->getBitfieldLength());
+      entryDict->put(KEY_BITFIELD,
+                     util::toHex(ps->getBitfield(), ps->getBitfieldLength()));
     }
   }
   const SharedHandle<DownloadContext>& dctx = group->getDownloadContext();
-  entryDict[KEY_PIECE_LENGTH] = util::uitos(dctx->getPieceLength());
-  entryDict[KEY_NUM_PIECES] = util::uitos(dctx->getNumPieces());
+  entryDict->put(KEY_PIECE_LENGTH, util::uitos(dctx->getPieceLength()));
+  entryDict->put(KEY_NUM_PIECES, util::uitos(dctx->getNumPieces()));
   if(!group->followedBy().empty()) {
-    BDE list = BDE::list();
+    SharedHandle<List> list = List::g();
     // The element is GID.
     for(std::vector<gid_t>::const_iterator i = group->followedBy().begin(),
           eoi = group->followedBy().end(); i != eoi; ++i) {
-      list << util::itos(*i);
+      list->append(util::itos(*i));
     }
-    entryDict[KEY_FOLLOWED_BY] = list;
+    entryDict->put(KEY_FOLLOWED_BY, list);
   }
   if(group->belongsTo()) {
-    entryDict[KEY_BELONGS_TO] = util::itos(group->belongsTo());
+    entryDict->put(KEY_BELONGS_TO, util::itos(group->belongsTo()));
   }
-  BDE files = BDE::list();
+  SharedHandle<List> files = List::g();
   createFileEntry
     (files, dctx->getFileEntries().begin(), dctx->getFileEntries().end());
-  entryDict[KEY_FILES] = files;
-  entryDict[KEY_DIR] = dctx->getDir();
+  entryDict->put(KEY_FILES, files);
+  entryDict->put(KEY_DIR, dctx->getDir());
 }
 
 #ifdef ENABLE_BITTORRENT
 void gatherBitTorrentMetadata
-(BDE& btDict, const SharedHandle<TorrentAttribute>& torrentAttrs)
+(const SharedHandle<Dict>& btDict,
+ const SharedHandle<TorrentAttribute>& torrentAttrs)
 {
   if(!torrentAttrs->comment.empty()) {
-    btDict[KEY_COMMENT] = torrentAttrs->comment;
+    btDict->put(KEY_COMMENT, torrentAttrs->comment);
   }
   if(torrentAttrs->creationDate) {
-    btDict[KEY_CREATION_DATE] = torrentAttrs->creationDate;
+    btDict->put(KEY_CREATION_DATE, Integer::g(torrentAttrs->creationDate));
   }
   if(!torrentAttrs->mode.empty()) {
-    btDict[KEY_MODE] = torrentAttrs->mode;
+    btDict->put(KEY_MODE, torrentAttrs->mode);
   }
-  BDE destAnnounceList = BDE::list();
+  SharedHandle<List> destAnnounceList = List::g();
   for(std::vector<std::vector<std::string> >::const_iterator l =
         torrentAttrs->announceList.begin(),
         eoi = torrentAttrs->announceList.end(); l != eoi; ++l) {
-    BDE destAnnounceTier = BDE::list();
+    SharedHandle<List> destAnnounceTier = List::g();
     for(std::vector<std::string>::const_iterator t = (*l).begin(),
           eoi2 = (*l).end(); t != eoi2; ++t) {
-      destAnnounceTier <<  *t;
+      destAnnounceTier->append(*t);
     }
-    destAnnounceList << destAnnounceTier;
+    destAnnounceList->append(destAnnounceTier);
   }
-  btDict[KEY_ANNOUNCE_LIST] = destAnnounceList;
+  btDict->put(KEY_ANNOUNCE_LIST, destAnnounceList);
   if(!torrentAttrs->metadata.empty()) {
-    BDE infoDict = BDE::dict();
-    infoDict[KEY_NAME] = torrentAttrs->name;
-    btDict[KEY_INFO] = infoDict;
+    SharedHandle<Dict> infoDict = Dict::g();
+    infoDict->put(KEY_NAME, torrentAttrs->name);
+    btDict->put(KEY_INFO, infoDict);
   }
 }
 
 static void gatherProgressBitTorrent
-(BDE& entryDict,
+(const SharedHandle<Dict>& entryDict,
  const SharedHandle<TorrentAttribute>& torrentAttrs,
  const BtObject& btObject)
 {
-  entryDict[KEY_INFO_HASH] = util::toHex(torrentAttrs->infoHash);
-  BDE btDict = BDE::dict();
+  entryDict->put(KEY_INFO_HASH, util::toHex(torrentAttrs->infoHash));
+  SharedHandle<Dict> btDict = Dict::g();
   gatherBitTorrentMetadata(btDict, torrentAttrs);
-  entryDict[KEY_BITTORRENT] = btDict;
+  entryDict->put(KEY_BITTORRENT, btDict);
   if(btObject.isNull()) {
-    entryDict[KEY_NUM_SEEDERS] = BDE_ZERO;
+    entryDict->put(KEY_NUM_SEEDERS, VLB_ZERO);
   } else {
     SharedHandle<PeerStorage> peerStorage = btObject._peerStorage;
     assert(!peerStorage.isNull());
-
     std::vector<SharedHandle<Peer> > peers;
     peerStorage->getActivePeers(peers);
-    entryDict[KEY_NUM_SEEDERS] =
-      util::uitos(countSeeder(peers.begin(), peers.end()));
+    entryDict->put(KEY_NUM_SEEDERS,
+                   util::uitos(countSeeder(peers.begin(), peers.end())));
   }
 }
 
-static void gatherPeer(BDE& peers, const SharedHandle<PeerStorage>& ps)
+static void gatherPeer
+(const SharedHandle<List>& peers, const SharedHandle<PeerStorage>& ps)
 {
   std::vector<SharedHandle<Peer> > activePeers;
   ps->getActivePeers(activePeers);
   for(std::vector<SharedHandle<Peer> >::const_iterator i =
         activePeers.begin(), eoi = activePeers.end(); i != eoi; ++i) {
-    BDE peerEntry = BDE::dict();
-    peerEntry[KEY_PEER_ID] = util::torrentPercentEncode((*i)->getPeerId(),
-                                                        PEER_ID_LENGTH);
-    peerEntry[KEY_IP] = (*i)->getIPAddress();
+    SharedHandle<Dict> peerEntry = Dict::g();
+    peerEntry->put(KEY_PEER_ID, util::torrentPercentEncode((*i)->getPeerId(),
+                                                           PEER_ID_LENGTH));
+    peerEntry->put(KEY_IP, (*i)->getIPAddress());
     if((*i)->isIncomingPeer()) {
-      peerEntry[KEY_PORT] = std::string("0");
+      peerEntry->put(KEY_PORT, VLB_ZERO);
     } else {
-      peerEntry[KEY_PORT] = util::uitos((*i)->getPort());
+      peerEntry->put(KEY_PORT, util::uitos((*i)->getPort()));
     }
-    peerEntry[KEY_BITFIELD] = util::toHex((*i)->getBitfield(),
-                                          (*i)->getBitfieldLength());
-    peerEntry[KEY_AM_CHOKING] = (*i)->amChoking()?BDE_TRUE:BDE_FALSE;
-    peerEntry[KEY_PEER_CHOKING] = (*i)->peerChoking()?BDE_TRUE:BDE_FALSE;
+    peerEntry->put(KEY_BITFIELD,
+                   util::toHex((*i)->getBitfield(), (*i)->getBitfieldLength()));
+    peerEntry->put(KEY_AM_CHOKING, (*i)->amChoking()?VLB_TRUE:VLB_FALSE);
+    peerEntry->put(KEY_PEER_CHOKING, (*i)->peerChoking()?VLB_TRUE:VLB_FALSE);
     TransferStat stat = ps->getTransferStatFor(*i);
-    peerEntry[KEY_DOWNLOAD_SPEED] = util::uitos(stat.getDownloadSpeed());
-    peerEntry[KEY_UPLOAD_SPEED] = util::uitos(stat.getUploadSpeed());
-    peerEntry[KEY_SEEDER] = (*i)->isSeeder()?BDE_TRUE:BDE_FALSE;
-    peers << peerEntry;
+    peerEntry->put(KEY_DOWNLOAD_SPEED, util::uitos(stat.getDownloadSpeed()));
+    peerEntry->put(KEY_UPLOAD_SPEED, util::uitos(stat.getUploadSpeed()));
+    peerEntry->put(KEY_SEEDER, (*i)->isSeeder()?VLB_TRUE:VLB_FALSE);
+    peers->append(peerEntry);
   }
 }
 #endif // ENABLE_BITTORRENT
 
 static void gatherProgress
-(BDE& entryDict, const SharedHandle<RequestGroup>& group, DownloadEngine* e)
+(const SharedHandle<Dict>& entryDict,
+ const SharedHandle<RequestGroup>& group, DownloadEngine* e)
 {
   gatherProgressCommon(entryDict, group);
 #ifdef ENABLE_BITTORRENT
@@ -659,63 +698,56 @@ static void gatherProgress
 }
 
 void gatherStoppedDownload
-(BDE& entryDict, const SharedHandle<DownloadResult>& ds)
+(const SharedHandle<Dict>& entryDict, const SharedHandle<DownloadResult>& ds)
 {
-  entryDict[KEY_GID] = util::itos(ds->gid);
-  entryDict[KEY_ERROR_CODE] = util::itos(static_cast<int>(ds->result));
+  entryDict->put(KEY_GID, util::itos(ds->gid));
+  entryDict->put(KEY_ERROR_CODE, util::itos(static_cast<int>(ds->result)));
   if(ds->result == downloadresultcode::IN_PROGRESS) {
-    entryDict[KEY_STATUS] = BDE_REMOVED;
+    entryDict->put(KEY_STATUS, VLB_REMOVED);
   } else if(ds->result == downloadresultcode::FINISHED) {
-    entryDict[KEY_STATUS] = BDE_COMPLETE;
+    entryDict->put(KEY_STATUS, VLB_COMPLETE);
   } else {
-    entryDict[KEY_STATUS] = BDE_ERROR;
+    entryDict->put(KEY_STATUS, VLB_ERROR);
   }
   if(!ds->followedBy.empty()) {
-    BDE list = BDE::list();
+    SharedHandle<List> list = List::g();
     // The element is GID.
     for(std::vector<gid_t>::const_iterator i = ds->followedBy.begin(),
           eoi = ds->followedBy.end(); i != eoi; ++i) {
-      list << util::itos(*i);
+      list->append(util::itos(*i));
     }
-    entryDict[KEY_FOLLOWED_BY] = list;
+    entryDict->put(KEY_FOLLOWED_BY, list);
   }
   if(ds->belongsTo) {
-    entryDict[KEY_BELONGS_TO] = util::itos(ds->belongsTo);
+    entryDict->put(KEY_BELONGS_TO, util::itos(ds->belongsTo));
   }
-  BDE files = BDE::list();
+  SharedHandle<List> files = List::g();
   createFileEntry(files, ds->fileEntries.begin(), ds->fileEntries.end());
-  entryDict[KEY_FILES] = files;
-  entryDict[KEY_TOTAL_LENGTH] = util::uitos(ds->totalLength);
-  entryDict[KEY_COMPLETED_LENGTH] = util::uitos(ds->completedLength);
-  entryDict[KEY_UPLOAD_LENGTH] = util::uitos(ds->uploadLength);
+  entryDict->put(KEY_FILES, files);
+  entryDict->put(KEY_TOTAL_LENGTH, util::uitos(ds->totalLength));
+  entryDict->put(KEY_COMPLETED_LENGTH, util::uitos(ds->completedLength));
+  entryDict->put(KEY_UPLOAD_LENGTH, util::uitos(ds->uploadLength));
   if(!ds->bitfieldStr.empty()) {
-    entryDict[KEY_BITFIELD] = ds->bitfieldStr;
+    entryDict->put(KEY_BITFIELD, ds->bitfieldStr);
   }
-  entryDict[KEY_DOWNLOAD_SPEED] = BDE_ZERO;
-  entryDict[KEY_UPLOAD_SPEED] = BDE_ZERO;
+  entryDict->put(KEY_DOWNLOAD_SPEED, VLB_ZERO);
+  entryDict->put(KEY_UPLOAD_SPEED, VLB_ZERO);
   if(!ds->infoHashStr.empty()) {
-    entryDict[KEY_INFO_HASH] = ds->infoHashStr;
-    entryDict[KEY_NUM_SEEDERS] = BDE_ZERO;
+    entryDict->put(KEY_INFO_HASH, ds->infoHashStr);
+    entryDict->put(KEY_NUM_SEEDERS, VLB_ZERO);
   }
-  entryDict[KEY_PIECE_LENGTH] = util::uitos(ds->pieceLength);
-  entryDict[KEY_NUM_PIECES] = util::uitos(ds->numPieces);
-  entryDict[KEY_CONNECTIONS] = BDE_ZERO;
-  entryDict[KEY_DIR] = ds->dir;
+  entryDict->put(KEY_PIECE_LENGTH, util::uitos(ds->pieceLength));
+  entryDict->put(KEY_NUM_PIECES, util::uitos(ds->numPieces));
+  entryDict->put(KEY_CONNECTIONS, VLB_ZERO);
+  entryDict->put(KEY_DIR, ds->dir);
 }
 
-BDE GetFilesXmlRpcMethod::process
+SharedHandle<ValueBase> GetFilesXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }
-  
-  gid_t gid = util::parseLLInt(params[0].s());
-
-  BDE files = BDE::list();
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
+  SharedHandle<List> files = List::g();
   SharedHandle<RequestGroup> group =
     findRequestGroup(e->getRequestGroupMan(), gid);
   if(group.isNull()) {
@@ -736,18 +768,11 @@ BDE GetFilesXmlRpcMethod::process
   return files;
 }
 
-BDE GetUrisXmlRpcMethod::process
+SharedHandle<ValueBase> GetUrisXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }
-  
-  gid_t gid = util::parseLLInt(params[0].s());
-
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
   SharedHandle<RequestGroup> group =
     findRequestGroup(e->getRequestGroupMan(), gid);
   if(group.isNull()) {
@@ -755,7 +780,7 @@ BDE GetUrisXmlRpcMethod::process
       (StringFormat("No URI data is available for GID#%s",
                     util::itos(gid).c_str()).str());
   }
-  BDE uriList = BDE::list();
+  SharedHandle<List> uriList = List::g();
   // TODO Current implementation just returns first FileEntry's URIs.
   if(!group->getDownloadContext()->getFileEntries().empty()) {
     createUriEntry(uriList, group->getDownloadContext()->getFirstFileEntry());
@@ -764,17 +789,11 @@ BDE GetUrisXmlRpcMethod::process
 }
 
 #ifdef ENABLE_BITTORRENT
-BDE GetPeersXmlRpcMethod::process
+SharedHandle<ValueBase> GetPeersXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }
-  
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
 
   SharedHandle<RequestGroup> group =
     findRequestGroup(e->getRequestGroupMan(), gid);
@@ -783,7 +802,7 @@ BDE GetPeersXmlRpcMethod::process
       (StringFormat("No peer data is available for GID#%s",
                     util::itos(gid).c_str()).str());
   }
-  BDE peers = BDE::list();
+  SharedHandle<List> peers = List::g();
   BtObject btObject = e->getBtRegistry()->get(group->getGID());
   if(!btObject.isNull()) {
     assert(!btObject._peerStorage.isNull());
@@ -793,22 +812,16 @@ BDE GetPeersXmlRpcMethod::process
 }
 #endif // ENABLE_BITTORRENT
 
-BDE TellStatusXmlRpcMethod::process
+SharedHandle<ValueBase> TellStatusXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }
-  
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
 
   SharedHandle<RequestGroup> group =
     e->getRequestGroupMan()->findRequestGroup(gid);
 
-  BDE entryDict = BDE::dict();
+  SharedHandle<Dict> entryDict = Dict::g();
   if(group.isNull()) {
     group = e->getRequestGroupMan()->findReservedGroup(gid);
     if(group.isNull()) {
@@ -822,31 +835,31 @@ BDE TellStatusXmlRpcMethod::process
       gatherStoppedDownload(entryDict, ds);
     } else {
       if(group->isPauseRequested()) {
-        entryDict[KEY_STATUS] = BDE_PAUSED;
+        entryDict->put(KEY_STATUS, VLB_PAUSED);
       } else {
-        entryDict[KEY_STATUS] = BDE_WAITING;
+        entryDict->put(KEY_STATUS, VLB_WAITING);
       }
       gatherProgress(entryDict, group, e);
     }
   } else {
-    entryDict[KEY_STATUS] = BDE_ACTIVE;
+    entryDict->put(KEY_STATUS, VLB_ACTIVE);
     gatherProgress(entryDict, group, e);
   }
   return entryDict;
 }
 
-BDE TellActiveXmlRpcMethod::process
+SharedHandle<ValueBase> TellActiveXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  BDE list = BDE::list();
+  SharedHandle<List> list = List::g();
   const std::deque<SharedHandle<RequestGroup> >& groups =
     e->getRequestGroupMan()->getRequestGroups();
   for(std::deque<SharedHandle<RequestGroup> >::const_iterator i =
         groups.begin(), eoi = groups.end(); i != eoi; ++i) {
-    BDE entryDict = BDE::dict();
-    entryDict[KEY_STATUS] = BDE_ACTIVE;
+    SharedHandle<Dict> entryDict = Dict::g();
+    entryDict->put(KEY_STATUS, VLB_ACTIVE);
     gatherProgress(entryDict, *i, e);
-    list << entryDict;
+    list->append(entryDict);
   }
   return list;
 }
@@ -858,13 +871,13 @@ TellWaitingXmlRpcMethod::getItems(DownloadEngine* e) const
 }
 
 void TellWaitingXmlRpcMethod::createEntry
-(BDE& entryDict, const SharedHandle<RequestGroup>& item,
+(const SharedHandle<Dict>& entryDict, const SharedHandle<RequestGroup>& item,
  DownloadEngine* e) const
 {
   if(item->isPauseRequested()) {
-    entryDict[KEY_STATUS] = BDE_PAUSED;
+    entryDict->put(KEY_STATUS, VLB_PAUSED);
   } else {
-    entryDict[KEY_STATUS] = BDE_WAITING;
+    entryDict->put(KEY_STATUS, VLB_WAITING);
   }
   gatherProgress(entryDict, item, e);
 }
@@ -876,28 +889,24 @@ TellStoppedXmlRpcMethod::getItems(DownloadEngine* e) const
 }
 
 void TellStoppedXmlRpcMethod::createEntry
-(BDE& entryDict, const SharedHandle<DownloadResult>& item,
+(const SharedHandle<Dict>& entryDict, const SharedHandle<DownloadResult>& item,
  DownloadEngine* e) const
 {
   gatherStoppedDownload(entryDict, item);
 }
 
-BDE PurgeDownloadResultXmlRpcMethod::process
+SharedHandle<ValueBase> PurgeDownloadResultXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
   e->getRequestGroupMan()->purgeDownloadResult();
-  return BDE_OK;
+  return VLB_OK;
 }
 
-BDE ChangeOptionXmlRpcMethod::process
+SharedHandle<ValueBase> ChangeOptionXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }  
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
 
   SharedHandle<RequestGroup> group =
     findRequestGroup(e->getRequestGroupMan(), gid);
@@ -907,8 +916,9 @@ BDE ChangeOptionXmlRpcMethod::process
                     util::itos(gid).c_str()).str());
   }
   SharedHandle<Option> option(new Option());
-  if(params.size() > 1 && params[1].isDict()) {
-    gatherChangeableOption(option, params[1]);
+  const Dict* optionsParam = getDictParam(params, 1);
+  if(optionsParam) {
+    gatherChangeableOption(option, optionsParam);
     applyChangeableOption(group->getOption().get(), option.get());
     if(option->defined(PREF_MAX_DOWNLOAD_LIMIT)) {
       group->setMaxDownloadSpeedLimit
@@ -926,19 +936,19 @@ BDE ChangeOptionXmlRpcMethod::process
     }
 #endif // ENABLE_BITTORRENT
   }
-  return BDE_OK;
+  return VLB_OK;
 }
 
-BDE ChangeGlobalOptionXmlRpcMethod::process
+SharedHandle<ValueBase> ChangeGlobalOptionXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isDict()) {
-    return BDE_OK;
+  const SharedHandle<List>& params = req.params;
+  const Dict* optionsParam = getDictParam(params, 0);
+  if(!optionsParam) {
+    return VLB_OK;
   }
   SharedHandle<Option> option(new Option());
-  gatherChangeableGlobalOption(option, params[0]);
+  gatherChangeableGlobalOption(option, optionsParam);
   applyChangeableGlobalOption(e->getOption(), option.get());
 
   if(option->defined(PREF_MAX_OVERALL_DOWNLOAD_LIMIT)) {
@@ -954,47 +964,44 @@ BDE ChangeGlobalOptionXmlRpcMethod::process
       (option->getAsInt(PREF_MAX_CONCURRENT_DOWNLOADS));
     e->getRequestGroupMan()->requestQueueCheck();
   }
-  return BDE_OK;
+  return VLB_OK;
 }
 
-BDE GetVersionXmlRpcMethod::process
+SharedHandle<ValueBase> GetVersionXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  BDE result = BDE::dict();
-  result[KEY_VERSION] = std::string(PACKAGE_VERSION);
-  BDE featureList = BDE::list();
+  SharedHandle<Dict> result = Dict::g();
+  result->put(KEY_VERSION, PACKAGE_VERSION);
+  SharedHandle<List> featureList = List::g();
   const FeatureMap& features = FeatureConfig::getInstance()->getFeatures();
   for(FeatureMap::const_iterator i = features.begin(), eoi = features.end();
       i != eoi;++i){
     if((*i).second) {
-      featureList << (*i).first;
+      featureList->append((*i).first);
     }
   }
-  result[KEY_ENABLED_FEATURES] = featureList;
+  result->put(KEY_ENABLED_FEATURES, featureList);
   return result;
 }
 
 template<typename InputIterator>
 static void pushRequestOption
-(BDE& dict, InputIterator optionFirst, InputIterator optionLast)
+(const SharedHandle<Dict>& dict,
+ InputIterator optionFirst, InputIterator optionLast)
 {
   const std::set<std::string>& requestOptions = listRequestOptions();
   for(; optionFirst != optionLast; ++optionFirst) {
     if(requestOptions.count((*optionFirst).first)) {
-      dict[(*optionFirst).first] = (*optionFirst).second;
+      dict->put((*optionFirst).first, (*optionFirst).second);
     }
   }
 }
 
-BDE GetOptionXmlRpcMethod::process
+SharedHandle<ValueBase> GetOptionXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
-  }  
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
 
   SharedHandle<RequestGroup> group =
     findRequestGroup(e->getRequestGroupMan(), gid);
@@ -1003,39 +1010,39 @@ BDE GetOptionXmlRpcMethod::process
       (StringFormat("Cannot get option for GID#%s",
                     util::itos(gid).c_str()).str());
   }
-  BDE result = BDE::dict();
+  SharedHandle<Dict> result = Dict::g();
   SharedHandle<Option> option = group->getOption();
   pushRequestOption(result, option->begin(), option->end());
   return result;
 }
 
-BDE GetGlobalOptionXmlRpcMethod::process
+SharedHandle<ValueBase> GetGlobalOptionXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  BDE result = BDE::dict();
+  SharedHandle<Dict> result = Dict::g();
   for(std::map<std::string, std::string>::const_iterator i =
         e->getOption()->begin(), eoi = e->getOption()->end(); i != eoi; ++i) {
     SharedHandle<OptionHandler> h = getOptionParser()->findByName((*i).first);
     if(!h.isNull() && !h->isHidden()) {
-      result[(*i).first] = (*i).second;
+      result->put((*i).first, (*i).second);
     }
   }
   return result;
 }
 
-BDE ChangePositionXmlRpcMethod::process
+SharedHandle<ValueBase> ChangePositionXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
+  const Integer* posParam = getIntegerParam(params, 1);
+  const String* howParam = getStringParam(params, 2);
 
-  if(params.size() != 3 ||
-     !params[0].isString() || !params[1].isInteger() || !params[2].isString()) {
+  if(!posParam || !howParam) {
     throw DL_ABORT_EX("Illegal argument.");
   }
-  gid_t gid = util::parseLLInt(params[0].s());
-  int pos = params[1].i();
-  const std::string& howStr = params[2].s();
+  int pos = posParam->i();
+  const std::string& howStr = howParam->s();
   RequestGroupMan::HOW how;
   if(howStr == "POS_SET") {
     how = RequestGroupMan::POS_SET;
@@ -1048,28 +1055,23 @@ BDE ChangePositionXmlRpcMethod::process
   }
   size_t destPos =
     e->getRequestGroupMan()->changeReservedGroupPosition(gid, pos, how);
-  BDE result(destPos);
+  SharedHandle<Integer> result = Integer::g(destPos);
   return result;
 }
 
-BDE GetSessionInfoXmlRpcMethod::process
+SharedHandle<ValueBase> GetSessionInfoXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  BDE result = BDE::dict();
-  result[KEY_SESSION_ID] = util::toHex(e->getSessionId());
+  SharedHandle<Dict> result = Dict::g();
+  result->put(KEY_SESSION_ID, util::toHex(e->getSessionId()));
   return result;
 }
 
-BDE GetServersXmlRpcMethod::process
+SharedHandle<ValueBase> GetServersXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-
-  if(params.empty() || !params[0].isString()) {
-    throw DL_ABORT_EX("Bad request");
-  }
-  gid_t gid = util::parseLLInt(params[0].s());
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
   SharedHandle<RequestGroup> group =
     e->getRequestGroupMan()->findRequestGroup(gid);
   if(group.isNull()) {
@@ -1078,53 +1080,49 @@ BDE GetServersXmlRpcMethod::process
   }
   const SharedHandle<DownloadContext>& dctx = group->getDownloadContext();
   const std::vector<SharedHandle<FileEntry> >& files = dctx->getFileEntries();
-  BDE result = BDE::list();
+  SharedHandle<List> result = List::g();
   size_t index = 1;
   for(std::vector<SharedHandle<FileEntry> >::const_iterator fi = files.begin(),
         eoi = files.end(); fi != eoi; ++fi, ++index) {
-    BDE fileEntry = BDE::dict();
-    fileEntry[KEY_INDEX] = util::uitos(index);
-    BDE servers = BDE::list();
+    SharedHandle<Dict> fileEntry = Dict::g();
+    fileEntry->put(KEY_INDEX, util::uitos(index));
+    SharedHandle<List> servers = List::g();
     const std::deque<SharedHandle<Request> >& requests =
       (*fi)->getInFlightRequests();
     for(std::deque<SharedHandle<Request> >::const_iterator ri =requests.begin(),
           eoi = requests.end(); ri != eoi; ++ri) {
       SharedHandle<PeerStat> ps = (*ri)->getPeerStat();
       if(!ps.isNull()) {
-        BDE serverEntry = BDE::dict();
-        serverEntry[KEY_URI] = (*ri)->getUri();
-        serverEntry[KEY_CURRENT_URI] = (*ri)->getCurrentUri();
-        serverEntry[KEY_DOWNLOAD_SPEED] =
-          util::uitos(ps->calculateDownloadSpeed());
-        servers << serverEntry;
+        SharedHandle<Dict> serverEntry = Dict::g();
+        serverEntry->put(KEY_URI, (*ri)->getUri());
+        serverEntry->put(KEY_CURRENT_URI, (*ri)->getCurrentUri());
+        serverEntry->put(KEY_DOWNLOAD_SPEED,
+                         util::uitos(ps->calculateDownloadSpeed()));
+        servers->append(serverEntry);
       }
     }
-    fileEntry[KEY_SERVERS] = servers;
-    result << fileEntry;
+    fileEntry->put(KEY_SERVERS, servers);
+    result->append(fileEntry);
   }
   return result;
 }
 
-BDE ChangeUriXmlRpcMethod::process
+SharedHandle<ValueBase> ChangeUriXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-
-  if(params.size() < 4 ||
-     !params[0].isString() || !params[1].isInteger() ||
-     !params[2].isList() || !params[3].isList() ||
-     params[1].i() <= 0) {
+  const SharedHandle<List>& params = req.params;
+  gid_t gid = getRequiredGidParam(params, 0);
+  const Integer* indexParam = getIntegerParam(params, 1);
+  const List* delUrisParam = getListParam(params, 2);
+  const List* addUrisParam = getListParam(params, 3);
+  if(!indexParam || !delUrisParam || ! addUrisParam) {
     throw DL_ABORT_EX("Bad request");
   }
   size_t pos = 0;
   bool posGiven = false;
   getPosParam(params, 4, posGiven, pos);
 
-  gid_t gid = util::parseLLInt(params[0].s());
-  size_t index = params[1].i()-1;
-  const BDE& deluris = params[2];
-  const BDE& adduris = params[3];
+  size_t index = indexParam->i()-1;
   SharedHandle<RequestGroup> group =
     findRequestGroup(e->getRequestGroupMan(), gid);
   if(group.isNull()) {
@@ -1139,25 +1137,28 @@ BDE ChangeUriXmlRpcMethod::process
   }
   SharedHandle<FileEntry> s = files[index];
   size_t delcount = 0;
-  for(BDE::List::const_iterator i = deluris.listBegin(),
-        eoi = deluris.listEnd(); i != eoi; ++i) {
-    if(s->removeUri((*i).s())) {
+  for(List::ValueType::const_iterator i = delUrisParam->begin(),
+        eoi = delUrisParam->end(); i != eoi; ++i) {
+    const String* uri = asString(*i);
+    if(uri && s->removeUri(uri->s())) {
       ++delcount;
     }
   }
   size_t addcount = 0;
   if(posGiven) {
-    for(BDE::List::const_iterator i = adduris.listBegin(),
-          eoi = adduris.listEnd(); i != eoi; ++i) {
-      if(s->insertUri((*i).s(), pos)) {
+    for(List::ValueType::const_iterator i = addUrisParam->begin(),
+          eoi = addUrisParam->end(); i != eoi; ++i) {
+      const String* uri = asString(*i);
+      if(uri && s->insertUri(uri->s(), pos)) {
         ++addcount;
         ++pos;
       }
     }
   } else {
-    for(BDE::List::const_iterator i = adduris.listBegin(),
-          eoi = adduris.listEnd(); i != eoi; ++i) {
-      if(s->addUri((*i).s())) {
+    for(List::ValueType::const_iterator i = addUrisParam->begin(),
+          eoi = addUrisParam->end(); i != eoi; ++i) {
+      const String* uri = asString(*i);
+      if(uri && s->addUri(uri->s())) {
         ++addcount;
       }
     }
@@ -1168,78 +1169,81 @@ BDE ChangeUriXmlRpcMethod::process
     e->addCommand(commands);
     group->getSegmentMan()->recognizeSegmentFor(s);
   }
-  BDE res = BDE::list();
-  res << delcount;
-  res << addcount;
+  SharedHandle<List> res = List::g();
+  res->append(Integer::g(delcount));
+  res->append(Integer::g(addcount));
   return res;
 }
 
-static BDE goingShutdown
+static SharedHandle<ValueBase> goingShutdown
 (const XmlRpcRequest& req, DownloadEngine* e, bool forceHalt)
 {
   // Schedule shutdown after 3seconds to give time to client to
   // receive XML-RPC response.
   e->addRoutineCommand(new TimedHaltCommand(e->newCUID(), e, 3, forceHalt));
   LogFactory::getInstance()->info("Scheduled shutdown in 3 seconds.");
-  return BDE_OK;
+  return VLB_OK;
 }
 
-BDE ShutdownXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
+SharedHandle<ValueBase> ShutdownXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
 {
   return goingShutdown(req, e, false);
 }
 
-BDE ForceShutdownXmlRpcMethod::process
+SharedHandle<ValueBase> ForceShutdownXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
   return goingShutdown(req, e, true);
 }
 
-BDE SystemMulticallXmlRpcMethod::process
+SharedHandle<ValueBase> SystemMulticallXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
-  const BDE& params = req.params;
-  assert(params.isList());
-  
-  if(params.size() != 1) {
+  const SharedHandle<List>& params = req.params;
+  const List* methodSpecs = getListParam(params, 0);
+  if(!methodSpecs) {
     throw DL_ABORT_EX("Illegal argument. One item list is expected.");
   }
-  const BDE& methodSpecs = params[0];
-  BDE list = BDE::list();
-  for(BDE::List::const_iterator i = methodSpecs.listBegin(),
-        eoi = methodSpecs.listEnd(); i != eoi; ++i) {
-    if(!(*i).isDict()) {
-      list << createErrorResponse
-        (DL_ABORT_EX("system.multicall expected struct."));
+  SharedHandle<List> list = List::g();
+  for(List::ValueType::const_iterator i = methodSpecs->begin(),
+        eoi = methodSpecs->end(); i != eoi; ++i) {
+    const Dict* methodDict = asDict(*i);
+    if(!methodDict) {
+      list->append(createErrorResponse
+                   (DL_ABORT_EX("system.multicall expected struct.")));
       continue;
     }
-    if(!(*i).containsKey(KEY_METHOD_NAME) ||
-       !(*i).containsKey(KEY_PARAMS)) {
-      list << createErrorResponse
-        (DL_ABORT_EX("Missing methodName or params."));
+    const String* methodName = asString(methodDict->get(KEY_METHOD_NAME));
+    const List* paramsList = asList(methodDict->get(KEY_PARAMS));
+
+    if(!methodName || !paramsList) {
+      list->append(createErrorResponse
+                   (DL_ABORT_EX("Missing methodName or params.")));
       continue;
     }
-    const std::string& methodName = (*i)[KEY_METHOD_NAME].s();
-    if(methodName == getMethodName()) {
-      list << createErrorResponse
-        (DL_ABORT_EX("Recursive system.multicall forbidden."));
+    if(methodName->s() == getMethodName()) {
+      list->append(createErrorResponse
+                   (DL_ABORT_EX("Recursive system.multicall forbidden.")));
       continue;
     }
-    SharedHandle<XmlRpcMethod> method = XmlRpcMethodFactory::create(methodName);
-    XmlRpcRequest innerReq(methodName, (*i)[KEY_PARAMS]);
+    SharedHandle<XmlRpcMethod> method =
+      XmlRpcMethodFactory::create(methodName->s());
+    XmlRpcRequest innerReq
+      (methodName->s(), static_pointer_cast<List>(methodDict->get(KEY_PARAMS)));
     XmlRpcResponse res = method->execute(innerReq, e);
     if(res.code == 0) {
-      BDE l = BDE::list();
-      l << res.param;
-      list << l;
+      SharedHandle<List> l = List::g();
+      l->append(res.param);
+      list->append(l);
     } else {
-      list << res.param;
+      list->append(res.param);
     }
   }
   return list;
 }
 
-BDE NoSuchMethodXmlRpcMethod::process
+SharedHandle<ValueBase> NoSuchMethodXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
   throw DL_ABORT_EX
diff --git a/src/XmlRpcMethodImpl.h b/src/XmlRpcMethodImpl.h
index 0b7abbae..c84e0fa9 100644
--- a/src/XmlRpcMethodImpl.h
+++ b/src/XmlRpcMethodImpl.h
@@ -41,10 +41,10 @@
 #include <deque>
 #include <algorithm>
 
-#include "BDE.h"
 #include "XmlRpcRequest.h"
 #include "ValueBase.h"
 #include "TorrentAttribute.h"
+#include "DlAbortEx.h"
 
 namespace aria2 {
 
@@ -55,7 +55,8 @@ namespace xmlrpc {
 
 class AddUriXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -66,7 +67,8 @@ public:
 
 class RemoveXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -77,7 +79,8 @@ public:
 
 class ForceRemoveXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -88,7 +91,8 @@ public:
 
 class PauseXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -99,7 +103,8 @@ public:
 
 class ForcePauseXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -110,7 +115,8 @@ public:
 
 class PauseAllXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -121,7 +127,8 @@ public:
 
 class ForcePauseAllXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -132,7 +139,8 @@ public:
 
 class UnpauseXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -143,7 +151,8 @@ public:
 
 class UnpauseAllXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -155,7 +164,8 @@ public:
 #ifdef ENABLE_BITTORRENT
 class AddTorrentXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -168,7 +178,8 @@ public:
 #ifdef ENABLE_METALINK
 class AddMetalinkXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -180,7 +191,8 @@ public:
 
 class PurgeDownloadResultXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -191,7 +203,8 @@ public:
 
 class GetUrisXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -202,7 +215,8 @@ public:
 
 class GetFilesXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -214,7 +228,8 @@ public:
 #ifdef ENABLE_BITTORRENT
 class GetPeersXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -226,7 +241,8 @@ public:
 
 class GetServersXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -237,7 +253,8 @@ public:
 
 class TellStatusXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -248,7 +265,8 @@ public:
 
 class TellActiveXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -279,7 +297,6 @@ private:
     } else if(size <= (size_t)offset) {
       return std::make_pair(last, last);
     }
-    BDE list = BDE::list();
     size_t lastDistance;
     if(size < offset+num) {
       lastDistance = size;
@@ -292,34 +309,37 @@ private:
     return std::make_pair(first, last);
   }
 
-  void checkPaginationParams(const BDE& params) const
+  void checkPaginationParams(const SharedHandle<List>& params) const
   {
-    assert(params.isList());
-    if(params.size() != 2 ||
-       !params[0].isInteger() || !params[1].isInteger() ||
-       params[1].i() < 0) {
+    if(params->size() != 2) {
+      throw DL_ABORT_EX("Invalid argument. Specify offset and num in integer.");
+    }
+    const Integer* p1 = asInteger(params->get(0));
+    const Integer* p2 = asInteger(params->get(1));
+    if(!p1 || !p2 || p2->i() < 0) {
       throw DL_ABORT_EX("Invalid argument. Specify offset and num in integer.");
     }
   }
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e)
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e)
   {
-    const BDE& params = req.params;
+    const SharedHandle<List>& params = req.params;
     checkPaginationParams(params);
-    ssize_t offset = params[0].i();
-    size_t num = params[1].i();
+    ssize_t offset = asInteger(params->get(0))->i();
+    size_t num = asInteger(params->get(1))->i();
     const std::deque<SharedHandle<T> >& items = getItems(e);
     std::pair<typename std::deque<SharedHandle<T> >::const_iterator,
       typename std::deque<SharedHandle<T> >::const_iterator> range =
       getPaginationRange(offset, num, items.begin(), items.end());
-    BDE list = BDE::list();
+    SharedHandle<List> list = List::g();
     for(; range.first != range.second; ++range.first) {
-      BDE entryDict = BDE::dict();
+      SharedHandle<Dict> entryDict = Dict::g();
       createEntry(entryDict, *range.first, e);
-      list << entryDict;
+      list->append(entryDict);
     }
     if(offset < 0) {
-      std::reverse(list.listBegin(), list.listEnd());
+      std::reverse(list->begin(), list->end());
     }
     return list;
   }
@@ -328,7 +348,9 @@ protected:
   getItems(DownloadEngine* e) const = 0;
 
   virtual void createEntry
-  (BDE& entryDict, const SharedHandle<T>& item, DownloadEngine* e) const = 0;
+  (const SharedHandle<Dict>& entryDict,
+   const SharedHandle<T>& item,
+   DownloadEngine* e) const = 0;
 };
 
 class TellWaitingXmlRpcMethod:
@@ -338,7 +360,8 @@ protected:
   getItems(DownloadEngine* e) const;
 
   virtual void createEntry
-  (BDE& entryDict, const SharedHandle<RequestGroup>& item,
+  (const SharedHandle<Dict>& entryDict,
+   const SharedHandle<RequestGroup>& item,
    DownloadEngine* e) const;
 public:
   static const std::string& getMethodName()
@@ -355,7 +378,8 @@ protected:
    getItems(DownloadEngine* e) const;
 
   virtual void createEntry
-  (BDE& entryDict, const SharedHandle<DownloadResult>& item,
+  (const SharedHandle<Dict>& entryDict,
+   const SharedHandle<DownloadResult>& item,
    DownloadEngine* e) const;
 public:
   static const std::string& getMethodName()
@@ -367,7 +391,8 @@ public:
 
 class ChangeOptionXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -378,7 +403,8 @@ public:
 
 class ChangeGlobalOptionXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -389,7 +415,8 @@ public:
 
 class GetVersionXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -400,7 +427,8 @@ public:
 
 class GetOptionXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -411,7 +439,8 @@ public:
 
 class GetGlobalOptionXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -422,7 +451,8 @@ public:
 
 class ChangePositionXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -433,7 +463,8 @@ public:
 
 class ChangeUriXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -444,7 +475,8 @@ public:
 
 class GetSessionInfoXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -455,7 +487,8 @@ public:
 
 class ShutdownXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -466,7 +499,8 @@ public:
 
 class ForceShutdownXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -477,7 +511,8 @@ public:
 
 class SystemMulticallXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 public:
   static const std::string& getMethodName()
   {
@@ -488,23 +523,25 @@ public:
 
 class NoSuchMethodXmlRpcMethod:public XmlRpcMethod {
 protected:
-  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+  virtual SharedHandle<ValueBase> process
+  (const XmlRpcRequest& req, DownloadEngine* e);
 };
 
 // Helper function to store data to entryDict from ds. This function
 // is used by tellStatus method.
 void gatherStoppedDownload
-(BDE& entryDict, const SharedHandle<DownloadResult>& ds);
+(const SharedHandle<Dict>& entryDict, const SharedHandle<DownloadResult>& ds);
 
 // Helper function to store data to entryDict from group. This
 // function is used by tellStatus/tellActive/tellWaiting method
 void gatherProgressCommon
-(BDE& entryDict, const SharedHandle<RequestGroup>& group);
+(const SharedHandle<Dict>& entryDict, const SharedHandle<RequestGroup>& group);
 
 #ifdef ENABLE_BITTORRENT
 // Helper function to store BitTorrent metadata from torrentAttrs.
 void gatherBitTorrentMetadata
-(BDE& btDict, const SharedHandle<TorrentAttribute>& torrentAttrs);
+(const SharedHandle<Dict>& btDict,
+ const SharedHandle<TorrentAttribute>& torrentAttrs);
 #endif // ENABLE_BITTORRENT
 
 } // namespace xmlrpc
diff --git a/src/XmlRpcRequest.h b/src/XmlRpcRequest.h
index ab54039a..3bdf8061 100644
--- a/src/XmlRpcRequest.h
+++ b/src/XmlRpcRequest.h
@@ -39,7 +39,7 @@
 
 #include <string>
 
-#include "BDE.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
@@ -47,9 +47,10 @@ namespace xmlrpc {
 
 struct XmlRpcRequest {
   std::string methodName;
-  BDE params;
+  SharedHandle<List> params;
 
-  XmlRpcRequest(const std::string& methodName, const BDE& params):
+  XmlRpcRequest(const std::string& methodName,
+                const SharedHandle<List>& params):
     methodName(methodName), params(params) {}
 };
 
diff --git a/src/XmlRpcRequestParserController.cc b/src/XmlRpcRequestParserController.cc
index 71f578df..30a31155 100644
--- a/src/XmlRpcRequestParserController.cc
+++ b/src/XmlRpcRequestParserController.cc
@@ -51,10 +51,11 @@ void XmlRpcRequestParserController::popStructFrame()
   assert(!_frameStack.empty());
 
   StateFrame parentFrame = _frameStack.top();
-  assert(parentFrame._value.isDict());
+  Dict* dict = asDict(parentFrame._value);
+  assert(dict);
   _frameStack.pop();
   if(_currentFrame.validMember()) {
-    parentFrame._value[_currentFrame._name] = _currentFrame._value;
+    dict->put(_currentFrame._name, _currentFrame._value);
   }
   _currentFrame = parentFrame;
 }
@@ -64,14 +65,33 @@ void XmlRpcRequestParserController::popArrayFrame()
   assert(!_frameStack.empty());
 
   StateFrame parentFrame = _frameStack.top();
-  assert(parentFrame._value.isList());
+  List* list = asList(parentFrame._value);
+  assert(list);
   _frameStack.pop();
-  if(!_currentFrame._value.isNone()) {
-    parentFrame._value << _currentFrame._value;
+  if(!_currentFrame._value.isNull()) {
+    list->append(_currentFrame._value);
   }
   _currentFrame = parentFrame;
 }
 
+void XmlRpcRequestParserController::setCurrentFrameValue
+(const SharedHandle<ValueBase>& value)
+{
+  _currentFrame._value = value;
+}
+
+void XmlRpcRequestParserController::setCurrentFrameName
+(const std::string& name)
+{
+  _currentFrame._name = name;
+}
+
+const SharedHandle<ValueBase>&
+XmlRpcRequestParserController::getCurrentFrameValue() const
+{
+  return _currentFrame._value;
+}
+
 } // namespace xmlrpc
   
 } // namespace aria2
diff --git a/src/XmlRpcRequestParserController.h b/src/XmlRpcRequestParserController.h
index 2a125bf4..b5c4832e 100644
--- a/src/XmlRpcRequestParserController.h
+++ b/src/XmlRpcRequestParserController.h
@@ -40,7 +40,7 @@
 #include <stack>
 #include <string>
 
-#include "BDE.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
@@ -50,12 +50,12 @@ class XmlRpcRequestParserController {
 private:
 
   struct StateFrame {
-    BDE _value;
+    SharedHandle<ValueBase> _value;
     std::string _name;
 
     bool validMember() const
     {
-      return !_value.isNone() && !_name.empty();
+      return !_value.isNull() && !_name.empty();
     }
   };
 
@@ -75,17 +75,11 @@ public:
   // to p and _currentFrame = p;
   void popArrayFrame();
   
-  void setCurrentFrameValue(const BDE& value)
-  {
-    _currentFrame._value = value;
-  }
+  void setCurrentFrameValue(const SharedHandle<ValueBase>& value);
 
-  void setCurrentFrameName(const std::string& name)
-  {
-    _currentFrame._name = name;
-  }
+  void setCurrentFrameName(const std::string& name);
 
-  const BDE& getCurrentFrameValue() const { return _currentFrame._value; }
+  const SharedHandle<ValueBase>& getCurrentFrameValue() const;
 
   void setMethodName(const std::string& methodName)
   {
diff --git a/src/XmlRpcRequestParserStateImpl.cc b/src/XmlRpcRequestParserStateImpl.cc
index 30efcc3d..1778f5f6 100644
--- a/src/XmlRpcRequestParserStateImpl.cc
+++ b/src/XmlRpcRequestParserStateImpl.cc
@@ -83,7 +83,7 @@ void MethodCallXmlRpcRequestParserState::beginElement
   if(name == elements::METHOD_NAME) {
     stm->pushMethodNameState();
   } else if(name == elements::A2_PARAMS) {
-    stm->setCurrentFrameValue(BDE::list());
+    stm->setCurrentFrameValue(List::g());
     stm->pushParamsState();
   } else {
     stm->pushUnknownElementState();
@@ -155,10 +155,10 @@ void ValueXmlRpcRequestParserState::beginElement
   if(name == elements::I4 || name == elements::INT) {
     stm->pushIntState();
   } else if(name == elements::STRUCT) {
-    stm->setCurrentFrameValue(BDE::dict());
+    stm->setCurrentFrameValue(Dict::g());
     stm->pushStructState();
   } else if(name == elements::ARRAY) {
-    stm->setCurrentFrameValue(BDE::list());
+    stm->setCurrentFrameValue(List::g());
     stm->pushArrayState();
   } else if(name == elements::STRING || name == elements::DOUBLE) {
     stm->pushStringState();
@@ -186,9 +186,9 @@ void IntXmlRpcRequestParserState::endElement
 {
   try {
     int64_t value = util::parseLLInt(characters);
-    stm->setCurrentFrameValue(BDE(value));
+    stm->setCurrentFrameValue(Integer::g(value));
   } catch(RecoverableException& e) {
-    // nothing to do here: We just leave current frame value to BDE::none
+    // nothing to do here: We just leave current frame value to null.
   }
 }
 
@@ -207,7 +207,7 @@ void StringXmlRpcRequestParserState::endElement
  const std::string& name,
  const std::string& characters)
 {
-  stm->setCurrentFrameValue(BDE(characters));
+  stm->setCurrentFrameValue(String::g(characters));
 }
 
 // Base64XmlRpcRequestParserState
@@ -225,7 +225,7 @@ void Base64XmlRpcRequestParserState::endElement
  const std::string& name,
  const std::string& characters)
 {
-  stm->setCurrentFrameValue(BDE(Base64::decode(characters)));
+  stm->setCurrentFrameValue(String::g(Base64::decode(characters)));
 }
 
 // StructXmlRpcRequestParserState
diff --git a/src/XmlRpcRequestParserStateMachine.h b/src/XmlRpcRequestParserStateMachine.h
index b5a515a8..ff308cfe 100644
--- a/src/XmlRpcRequestParserStateMachine.h
+++ b/src/XmlRpcRequestParserStateMachine.h
@@ -41,14 +41,12 @@
 #include <map>
 #include <stack>
 
-#include "BDE.h"
 #include "XmlRpcRequestParserController.h"
 #include "XmlRpcRequestParserStateImpl.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
-class BDE;
-
 namespace xmlrpc {
 
 class XmlRpcRequestParserStateMachine {
@@ -116,12 +114,12 @@ public:
     _controller->pushFrame();
   }
 
-  void setCurrentFrameValue(const BDE& value)
+  void setCurrentFrameValue(const SharedHandle<ValueBase>& value)
   {
     _controller->setCurrentFrameValue(value);
   }
 
-  const BDE& getCurrentFrameValue() const
+  const SharedHandle<ValueBase>& getCurrentFrameValue() const
   {
     return _controller->getCurrentFrameValue();
   }
diff --git a/src/XmlRpcResponse.cc b/src/XmlRpcResponse.cc
index f9056c18..5b3b62fe 100644
--- a/src/XmlRpcResponse.cc
+++ b/src/XmlRpcResponse.cc
@@ -47,51 +47,56 @@ namespace aria2 {
 namespace xmlrpc {
 
 template<typename OutputStream>
-static void encodeValue(const BDE& value, OutputStream& o);
-
-template<typename InputIterator, typename OutputStream>
-static void encodeArray
-(InputIterator first, InputIterator last, OutputStream& o)
+static void encodeValue(const SharedHandle<ValueBase>& value, OutputStream& o)
 {
-  o << "<array>" << "<data>";
-  for(; first != last; ++first) {
-    encodeValue(*first, o);
-  }
-  o << "</data>" << "</array>";
-}
+  class XmlValueBaseVisitor:public ValueBaseVisitor {
+  private:
+    OutputStream& o_;
+  public:
+    XmlValueBaseVisitor(OutputStream& o):o_(o) {}
 
-template<typename InputIterator, typename OutputStream>
-static void encodeStruct
-(InputIterator first, InputIterator last, OutputStream& o)
-{
-  o << "<struct>";
-  for(; first != last; ++first) {
-    o << "<member>"
-      << "<name>" << util::htmlEscape((*first).first) << "</name>";
-    encodeValue((*first).second, o);
-    o << "</member>";
-  }
-  o << "</struct>";
-}
+    virtual ~XmlValueBaseVisitor() {}
 
-template<typename OutputStream>
-static void encodeValue(const BDE& value, OutputStream& o)
-{
-  o << "<value>";
-  if(value.isString()) {
-    o << "<string>" << util::htmlEscape(value.s()) << "</string>";
-  } else if(value.isInteger()) {
-    o << "<int>" << value.i() << "</int>";
-  } else if(value.isList()) {
-    encodeArray(value.listBegin(), value.listEnd(), o);
-  } else if(value.isDict()) {
-    encodeStruct(value.dictBegin(), value.dictEnd(), o);
-  }
-  o << "</value>";
+    virtual void visit(const String& v)
+    {
+      o_ << "<value><string>" << util::htmlEscape(v.s()) << "</string></value>";
+    }
+
+    virtual void visit(const Integer& v)
+    {
+      o_ << "<value><int>" << v.i() << "</int></value>";
+    }
+
+    virtual void visit(const List& v)
+    {
+      o_ << "<value><array><data>";
+      for(List::ValueType::const_iterator i = v.begin(), eoi = v.end();
+          i != eoi; ++i) {
+        (*i)->accept(*this);
+      }
+      o_ << "</data></array></value>";
+    }
+
+    virtual void visit(const Dict& v)
+    {
+      o_ << "<value><struct>";
+      for(Dict::ValueType::const_iterator i = v.begin(), eoi = v.end();
+          i != eoi; ++i) {
+        o_ << "<member><name>" << util::htmlEscape((*i).first) << "</name>";
+        (*i).second->accept(*this);
+        o_ << "</member>";
+      }
+      o_ << "</struct></value>";
+    }
+  };
+
+  XmlValueBaseVisitor visitor(o);
+  value->accept(visitor);
 }
 
 template<typename OutputStream>
-std::string encodeAll(OutputStream& o, int code, const BDE& param)
+std::string encodeAll
+(OutputStream& o, int code, const SharedHandle<ValueBase>& param)
 {
   o << "<?xml version=\"1.0\"?>" << "<methodResponse>";
   if(code == 0) {
diff --git a/src/XmlRpcResponse.h b/src/XmlRpcResponse.h
index 313420a7..a3106ff0 100644
--- a/src/XmlRpcResponse.h
+++ b/src/XmlRpcResponse.h
@@ -39,7 +39,7 @@
 
 #include <string>
 
-#include "BDE.h"
+#include "ValueBase.h"
 
 namespace aria2 {
 
@@ -49,9 +49,10 @@ struct XmlRpcResponse {
   // 0 for success, non-zero for error
   int code;
   
-  BDE param;
+  SharedHandle<ValueBase> param;
 
-  XmlRpcResponse(int code, const BDE& param):code(code), param(param) {}
+  XmlRpcResponse
+  (int code, const SharedHandle<ValueBase>& param):code(code), param(param) {}
 
   std::string toXml(bool gzip = false) const;
 };
diff --git a/src/bencode.cc b/src/bencode.cc
deleted file mode 100644
index 763e19a9..00000000
--- a/src/bencode.cc
+++ /dev/null
@@ -1,242 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "bencode.h"
-
-#include <fstream>
-#include <sstream>
-
-#include "StringFormat.h"
-#include "DlAbortEx.h"
-
-namespace aria2 {
-
-namespace bencode {
-
-static BDE decodeiter(std::istream& ss, size_t depth);
-
-static void checkdelim(std::istream& ss, const char delim = ':')
-{
-  char d;
-  if(!(ss.get(d) && d == delim)) {
-    throw DL_ABORT_EX
-      (StringFormat("Bencode decoding failed: Delimiter '%c' not found.",
-                    delim).str());
-  }
-}
-
-static std::string decoderawstring(std::istream& ss)
-{
-  int length;
-  ss >> length;
-  if(!ss || length < 0) {
-    throw DL_ABORT_EX("Bencode decoding failed:"
-                      " A positive integer expected but none found.");
-  }
-  // TODO check length, it must be less than or equal to INT_MAX
-  checkdelim(ss);
-  char* buf = new char[length];
-  ss.read(buf, length);
-  std::string str(&buf[0], &buf[length]);
-  delete [] buf;
-  if(ss.gcount() != static_cast<int>(length)) {
-    throw DL_ABORT_EX
-      (StringFormat("Bencode decoding failed:"
-                    " Expected %lu bytes of data, but only %d read.",
-                    static_cast<unsigned long>(length), ss.gcount()).str());
-  }
-  return str;
-}
-
-static BDE decodestring(std::istream& ss)
-{
-  return BDE(decoderawstring(ss));
-}
-
-static BDE decodeinteger(std::istream& ss)
-{
-  BDE::Integer integer;
-  ss >> integer;
-  if(!ss) {
-    throw DL_ABORT_EX("Bencode decoding failed:"
-                      " Integer expected but none found");
-  }
-  checkdelim(ss, 'e');
-  return BDE(integer);
-}
-
-static BDE decodedict(std::istream& ss, size_t depth)
-{
-  BDE dict = BDE::dict();
-  char c;
-  while(ss.get(c)) {
-    if(c == 'e') {
-      return dict;
-    } else {
-      ss.unget();
-      std::string key = decoderawstring(ss);
-      dict[key] = decodeiter(ss, depth);
-    }
-  }
-  throw DL_ABORT_EX("Bencode decoding failed:"
-                    " Unexpected EOF in dict context. 'e' expected.");
-}
-
-static BDE decodelist(std::istream& ss, size_t depth)
-{
-  BDE list = BDE::list();
-  char c;
-  while(ss.get(c)) {
-    if(c == 'e') {
-      return list;
-    } else {
-      ss.unget();
-      list << decodeiter(ss, depth);
-    }
-  }
-  throw DL_ABORT_EX("Bencode decoding failed:"
-                    " Unexpected EOF in list context. 'e' expected.");
-}
-
-static void checkDepth(size_t depth)
-{
-  if(depth >= MAX_STRUCTURE_DEPTH) {
-    throw DL_ABORT_EX("Bencode decoding failed: Structure is too deep.");
-  }
-}
-
-static BDE decodeiter(std::istream& ss, size_t depth)
-{
-  checkDepth(depth);
-  char c;
-  if(!ss.get(c)) {
-    throw DL_ABORT_EX("Bencode decoding failed:"
-                      " Unexpected EOF in term context."
-                      " 'd', 'l', 'i' or digit is expected.");
-  }
-  if(c == 'd') {
-    return decodedict(ss, depth+1);
-  } else if(c == 'l') {
-    return decodelist(ss, depth+1);
-  } else if(c == 'i') {
-    return decodeinteger(ss);
-  } else {
-    ss.unget();
-    return decodestring(ss);
-  }
-}
-
-BDE decode(std::istream& in)
-{
-  return decodeiter(in, 0);
-}
-
-BDE decode(const std::string& s)
-{
-  size_t end;
-  return decode(s, end);
-}
-
-BDE decode(const std::string& s, size_t& end)
-{
-  if(s.empty()) {
-    return BDE::none;
-  }
-  std::istringstream ss(s);
-
-  BDE bde = decodeiter(ss, 0);
-  end = ss.tellg();
-  return bde;
-}
-
-BDE decode(const unsigned char* data, size_t length)
-{
-  return decode(std::string(&data[0], &data[length]));
-}
-
-BDE decode(const unsigned char* data, size_t length, size_t& end)
-{
-  return decode(std::string(&data[0], &data[length]), end);
-}
-
-BDE decodeFromFile(const std::string& filename)
-{
-  std::ifstream f(filename.c_str(), std::ios::binary);
-  if(f) {
-    return decode(f);
-  } else {
-    throw DL_ABORT_EX
-      (StringFormat("Bencode decoding failed:"
-                    " Cannot open file '%s'.", filename.c_str()).str());
-  }
-}
-
-static void encodeIter(std::ostream& o, const BDE& bde)
-{
-  if(bde.isInteger()) {
-    o << "i" << bde.i() << "e";
-  } else if(bde.isString()) {
-    const std::string& s = bde.s();
-    o << s.size() << ":";
-    o.write(s.data(), s.size());
-  } else if(bde.isDict()) {
-    o << "d";
-    for(BDE::Dict::const_iterator i = bde.dictBegin(), eoi = bde.dictEnd();
-        i != eoi; ++i){
-      const std::string& key = (*i).first;
-      o << key.size() << ":";
-      o.write(key.data(), key.size());
-      encodeIter(o, (*i).second);
-    }
-    o << "e";
-  } else if(bde.isList()) {
-    o << "l";
-    for(BDE::List::const_iterator i = bde.listBegin(), eoi = bde.listEnd();
-        i != eoi; ++i){
-      encodeIter(o, *i);
-    }
-    o << "e";
-  }
-}
-
-std::string encode(const BDE& bde)
-{
-  std::ostringstream ss;
-  encodeIter(ss, bde);
-  return ss.str();
-}
-
-} // namespace bencode
-
-} // namespace aria2
diff --git a/src/bencode.h b/src/bencode.h
deleted file mode 100644
index b865b8ae..00000000
--- a/src/bencode.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_BENCODE_H_
-#define _D_BENCODE_H_
-
-#include "common.h"
-
-#include <string>
-#include <iosfwd>
-
-#include "BDE.h"
-
-namespace aria2 {
-
-namespace bencode {
-
-const size_t MAX_STRUCTURE_DEPTH = 100;
-
-BDE decode(std::istream& in);
-
-// Decode the data in s.
-BDE decode(const std::string& s);
-
-// Decode the data in s. After decode is done successfully, return the
-// bencoded string length in end.
-BDE decode(const std::string& s, size_t& end);
-
-BDE decode(const unsigned char* data, size_t length);
-
-BDE decode(const unsigned char* data, size_t length, size_t& end);
-
-BDE decodeFromFile(const std::string& filename);
-
-std::string encode(const BDE& bde);
-
-} // namespace bencode
-
-} // namespace aria2
-
-#endif // _D_BENCODE_H_
diff --git a/src/bittorrent_helper.cc b/src/bittorrent_helper.cc
index cbac20c7..323a9f0d 100644
--- a/src/bittorrent_helper.cc
+++ b/src/bittorrent_helper.cc
@@ -40,7 +40,6 @@
 
 #include "DownloadContext.h"
 #include "Randomizer.h"
-#include "bencode.h"
 #include "util.h"
 #include "DlAbortEx.h"
 #include "message.h"
author	Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>	2010-06-19 17:54:54 +0000
committer	Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>	2010-06-19 17:54:54 +0000
commit	cb4e25e4b4a2cfa6349a25586a44c932022e6841 (patch)
tree	15c0713df0ca88784a0c95a466e3a846192f290b /src
parent	8ba97188ce42be38b5427e9bd70bb7f5ba8238f9 (diff)