Add BaseQuery