Revise and enhance integration with GPG.