Separated filters from builders
Made filters a first-class entity