Refactor Storage<--SqliteDB