Refactor ContainerMatcher