Add forgotten file for last commit
Consider UseNoteEncryption in the config

* Also refactor: Eliminate IDbStorageFactor and have
  single DbStorageFactory