Added groups for ships and for labels.