Changed base class of Predicate from Expression to Node
Added classes for the manual converting Predicate <-> Expression