Tools/Extractors: Updated map extractor