Better handling of group attributes