Moved inner class to peer so that we can serialize it for Crypto Handle Repository.