Matcher refactorisation