Refactoring \Change\Documents\Query\Builder