Added enamel grouping