Refactoring: pubkeys + persist signature