Use flex matching everywhere