Added Factor class.