ARQ-1563 Consolidated common code into a single BaseEnricher class.
ARQ-1563 Renamed classes to be clear about rest enrichment.