Custom matcher flexibility added