Rewrite Query Builder [WIP]