Add "regex" and "name" options