With the new Groups feature you can now create sets containing machines, backup sets and licences.