Added more TDM support