Adding support for GPG