Initial modification supporting groups with spaces in name