Add proper matcher to improve readability