Packages from the vendor simplify

simplify/query-builder