Made an upgrade to support TP 3.0.0-M5