Table representation of factors implemented (and related changes)