Add grouping to Amel customization