Feat/encrypted storage