Apply changes for new API structure to T2 class.