Added group validations