Upgraded device groupingx