Update and fix Factorization Integration.