Add validation. Fix validating matchers.