Refactored an import - PatchDatabaseWrapper -> FileStoreDatabase