Added option to use sqlite instead of deprecated file based storage