Refactor source mapper to inheirit from a base class