SQLiteStorage refactoring