[DDC-93] Add some TODOs in code.