Changed GroupDataSource to a singleton.