Support custom matcher completion