Added primitives and some larger predicate