Adjust to new TM interface