Add group option

Note that this changed the expected manifest format.