add generic matchers