Update for TBone template support.