Converting everything to use new PrivateKey type
Converting everything to use new PrivateKey type (2/2)