Optimize matcher