Get rid of dependency on Group()