More information added to TODO.