Updated imports in group classes