Refactored converter and extractor classes