Added Per-user Grouping to Machines