update extractor classes to reflect changes to mapper