Add new TODO about structure.