Added NoSQL storage