Adding groups api support