Refactor client variables

Return both Paginator and QueryBuidler objects at once