Add more match options