Refactoring SQLiteStorage