Adding user and group zap support