Refactor `PredicateBuilder` from singleton to instance