Add support for encrypter persistence
Cleanup