Refactor CargoMatcher to new class.