Fix group spec
Fix format