Improve Match spec