Add-on to Check to support TMC