Finish matchers and add mixin