Added group functionality and related features