Added TDM support