Return some extra information
Change to a bit more valid data
Define for now how the PGP api should be a bit more firmly