added related classes to group, and API client