Adding the group zap support.