Added TODOs from module_data project