enhancement: added system.get('unit') and grouping to system.get('units')