Rework OpExecutorTDB2