rename Match to Group, improve match vs group interface
implement the better interface
update interface