Better support for InsertQuery and termination status.