Updated TODO structure.