Rename docblock
Typehint the query builder