Add support for optional matches (1 of 2)