Added query builder metadata