Add "match" and "name" options