[WIP] feat(services) Query builder