Updated code for newer tAPI/MCT