Changes in Factor class according to the new representation