Added group parsing