Updated groups module