Added support for arrays/repeats of groups