Add custom matcher and utility method