Updated to make it easy to add/remove datasets to/from groups for #279