Initial Query Builder integration