Added Factorization support