Further changes for GPG key adding.