I think EncryptedPKModel* should also move away from here