Added new factor functions: AND, OR, Equal, IsTrue. Changed syntax.