Adding ability to store public keys