Updated groups scripts