Updated compatibility for the latest TC