Refactor outsource matthes