Added TM 1 support