Update for GPG support