Add support for optional matches (2 of 2)