Added info in TODO