add query and query provider base