Apply Policy To Hardware ID by Group

When applying a policy to Hardware ID (we do this to apply a specific policy to certain remote only laptops) it would be nice if we could assign the policy to a group or criteria from Device Manager. e.g. if they are all in group "Remote Laptop" instead of having to add each MAC address/machine to the policy individually.