add query and object pool