Move default matcher to container