diff --git a/TODO b/TODO
index 965e91fa72c96947cd97c2374f1695a42035f155..2a52b1cd95680077386ccae0e611c2aaff41e2c2 100644
--- a/TODO
+++ b/TODO
@@ -115,6 +115,7 @@ RC  - Review output of pylint (CODE)
       an incoming packet that trigger the poll() system call.
     - Allow daemonize NEO processes, re-use code from TIDStorage and support
       start/stop/restart/status commands.
+    - Implement name resolution to allow use names instead of IPs
 
 
     Storage
@@ -154,6 +155,11 @@ RC  - Review output of pylint (CODE)
       of maximum SQL request size allowed. (SPEED)
     - Prevent from SQL injection, escape() from MySQLdb api is not sufficient,
       consider using query(request, args) instead of query(request % args)
+    - Review database API, move under_transaction verification to generic part.
+    - Create database adapter for other RDBMS (sqlite, postgres)
+    - fix __undoLog when there is out of date cells, there is a busy loop
+      because the client expected more answer than the available number of
+      storage nodes.
     - Improve replication process (BANDWITH)
       Current implementation do this way to replicate objects (for a given TID):
         S1 > S2 : Ask for a range of OIDs