Working on next gen of query pipeline