Improvement for latest pdoTools versions