Fix Factorization integration