Fix generic types for StockImporterMapper