Add Predicate and QueryOptions modules