Hotfix/4 impl factory matcher