implements groups for all entities properly
Merge pull request #38 from kamalpreetgrewal/master

implements groups for all entities properly