Incorporate API changes part 4: tb_*
Merge pull request #532 from z16/4.1

Incorporate API changes part 4: tb_*