Add TODO tasks to DumpExtractor