Updated Group to fix some issues with not checking children