More refactoring, renamed Factor.addValue.