Refactored convertor and extractor classes