Adding back in gpg related functions