Use the enums and access methods for group labels
Merge pull request #465 from vered1986/master

Use the enums and access methods for group labels