reorganize DumpExtractor code