Added predicate based partitioning