CARE #78: Create a query builder