Adding matchers in the common module