Revert "Removed Group API"

This reverts commit 7c6272100de9e2336625abffc9849e4d8eb20bff.