Add support a group regex vars
Add group variables